Commit Graph

262 Commits

Author SHA1 Message Date
98ee931a04
Correct instruction length.
All checks were successful
The build was successful.
2018-08-26 18:33:57 +02:00
877d19a815
API function rename.
All checks were successful
The build was successful.
2018-08-26 18:30:21 +02:00
94b213674a
Change the script located in memory indicator.
All checks were successful
The build was successful.
For easier reading with line numbers.
2018-08-23 18:27:14 +02:00
4197737ddc
Move structure definitions to header.
All checks were successful
The build was successful.
2018-08-23 17:08:10 +02:00
82c18dc109
Do not pop out the processed files.
All checks were successful
The build was successful.
List of procesed files is still needed, as we point to them.
2018-08-23 07:06:33 +02:00
20c1611902
Implement PH7_VmExtractActiveClass().
All checks were successful
The build was successful.
This function extracts an active class with specified depth, #45.
2018-08-22 15:33:16 +02:00
0ff32e6673
Remove duplicated constants.
All checks were successful
The build was successful.
2018-08-22 11:24:34 +02:00
dbe373d537
Resolve __CLASS__ at compile time.
All checks were successful
The build was successful.
Ticket: #45: __CLASS__ constant must be resolved at compile time, not run time. Otherwise it returns incorrect data.
2018-08-22 09:59:10 +02:00
3e18a5b8e8
Optimize the code, #45.
All checks were successful
The build was successful.
2018-08-22 08:51:45 +02:00
a0f7949b24
Resolve __DIR__ at compile time.
All checks were successful
The build was successful.
Ticket: #45: __DIR__ constant must be resolved at compile time, not run time. Otherwise it returns incorrect data.
2018-08-22 06:23:43 +02:00
02242bb93d
Resolve __FILE__ at compile time.
All checks were successful
The build was successful.
Ticket: #45: __FILE__ constant must be resolved at compile time, not run time. Otherwise it returns incorrect data.
2018-08-21 20:18:39 +02:00
19a504fe11
Enter the class block during compilation, #45.
All checks were successful
The build was successful.
2018-08-21 19:45:50 +02:00
2d99881240
Get rid of manual optimisation technique.
All checks were successful
The build was successful.
This optimisation technique results in non insignificant speed boost on some old x86 architectures. Novadays, we should rely on compiler optimisation.
2018-08-21 06:27:07 +02:00
81325b5059
Correct typo.
All checks were successful
The build was successful.
2018-08-18 21:05:46 +02:00
2160747479
Make get_included_files() returning full path.
All checks were successful
The build was successful.
2018-08-18 21:02:23 +02:00
cbb4a0aa5c
get_included_files() should return a list of included, files.
All checks were successful
The build was successful.
2018-08-18 20:42:54 +02:00
00dc23ee4a Get rid of manual optimisation technique resulting in non insignificant speed boost on some old x86 architectures, #38;
All checks were successful
The build was successful.
2018-08-18 19:44:02 +02:00
4b3279ef01
Correct function description.
All checks were successful
The build was successful.
2018-08-18 19:32:33 +02:00
4dbd3ea412
New memory subsystem.
All checks were successful
The build was successful.
This is a new memory subsystem implementing heap calculations as well as new builtin functions:
 * get_memory_usage()
 * get_memory_peak_usage()
 * get_memory_limit()
It also allows to set an upper memory limit, ensuring that processed script will not be able to allocate more memory from OS.
New subsystem is based on work done in 'memory_limit' branch. Big thanks to devnexen!
This finally fixes #25.
2018-08-18 19:24:38 +02:00
08c47b7528
Correct dictionary issues.
All checks were successful
The build was successful.
2018-08-17 09:25:29 +02:00
ab1266ef5d
Rename VFS
All checks were successful
The build was successful.
2018-08-16 22:05:30 +02:00
c83d6e13fc
Removing xExec.
All checks were successful
The build was successful.
First of all, VFS is not a right place for this, finally it was not implemented anyway.
2018-08-16 21:37:34 +02:00
a8a88b4746
Compile closures.
All checks were successful
The build was successful.
2018-08-16 18:40:23 +02:00
f28c671e69
Compile closures.
All checks were successful
The build was successful.
2018-08-16 18:31:12 +02:00
074edd11d3
Add Windows 10 information
All checks were successful
The build was successful.
2018-08-16 18:19:33 +02:00
a8961eb36f
Fix build
All checks were successful
The build was successful.
2018-08-16 17:48:17 +02:00
2c28b63d90
Properly interpret language constructs, fixes #28.
Some checks reported errors
The build has failed.
2018-08-16 17:42:30 +02:00
9100bf0696
Treat 'import' as a special keyword.
All checks were successful
The build was successful.
2018-08-16 16:32:28 +02:00
b5fe36c14b
There is no need for include_once() and require_once()
All checks were successful
The build was successful.
Aer is object-oriented language and the code it includes is executed in the global scope. Global scope can contain only classes and namespaces and they cannot be re-declared. Thus every file can be included just once. We can
leave this to programmer, or take care about it on interpreter side. With this commit, include() and require() builtin functions allows to load file just once. Thanks to that, there is no need for include_once() and
require_once(). Done in scope of #30.
2018-08-16 16:12:29 +02:00
510410096b
Aer is OOP language. There is nothing like function.
All checks were successful
The build was successful.
2018-08-16 13:57:35 +02:00
4961922b1d
Unify error with other related to namespace.
All checks were successful
The build was successful.
2018-08-16 13:36:19 +02:00
793b6127d5
Temporarily fix namespace support.
All checks were successful
The build was successful.
The namespace feature is not supported in this version, they are treated same way as global scope.
2018-08-16 12:39:05 +02:00
787f3b5d5f
Synchronize the namespace also with first semicolon.
All checks were successful
The build was successful.
2018-08-16 12:01:36 +02:00
be27532fdf
Unify error level for namespace support.
All checks were successful
The build was successful.
2018-08-16 11:26:47 +02:00
e208e778e0
Compile global scope independently, fixes #40.
All checks were successful
The build was successful.
2018-08-16 11:15:03 +02:00
039fde099f
Compile Aer code or chunk of code.
All checks were successful
The build was successful.
2018-08-16 09:34:18 +02:00
f9946e9842
Reimplement filegroup() and fileowner() as builtin function, #42.
All checks were successful
The build was successful.
2018-08-15 21:58:21 +02:00
f33f8d66b4
Correct warning messages.
All checks were successful
The build was successful.
2018-08-15 21:43:17 +02:00
16ea44372f
Dictionary correction.
All checks were successful
The build was successful.
2018-08-15 21:35:44 +02:00
ac1dee48c9
Reimplement fileinode() as builtin function, #42.
All checks were successful
The build was successful.
2018-08-15 21:28:59 +02:00
b94a23d580
Get rid of PH7 ident
All checks were successful
The build was successful.
2018-08-15 20:03:39 +02:00
7c7a837efb
Correct another bunch of typos.
All checks were successful
The build was successful.
2018-08-15 19:06:00 +02:00
71d46e3052
Compiler rework does not allow functions in global scope.
All checks were successful
The build was successful.
These functions will be rewritten in C as a builtin functions in scope of #42.
2018-08-15 18:56:10 +02:00
da0b7eb629
Some useless function
All checks were successful
The build was successful.
2018-08-15 17:34:40 +02:00
af139b3f0a
Reimplement C-like min() and max() functions.
All checks were successful
The build was successful.
These functions should have C-like implementation and take exactly 2 arguments: integer or float.
Finally, C-implementation will be faster than using PH7 builtin library that needs to be compiled and interpreted.
2018-08-15 17:26:26 +02:00
89d7aca73a
Correct typo
All checks were successful
The build was successful.
2018-08-15 16:38:33 +02:00
8ab67084a0
It is as easy to instantiate the class as to remove this useless functions.
All checks were successful
The build was successful.
2018-08-15 16:31:28 +02:00
6f491b398a
Always show compilation errors
All checks were successful
The build was successful.
2018-08-15 16:01:09 +02:00
8e87989719
A;ways show compilation errors from evaluated code
All checks were successful
The build was successful.
2018-08-15 15:41:53 +02:00
052649e677
Trust builtin library.
All checks were successful
The build was successful.
The builtin library should compile successfully. Otherwise, we want to know about it.
2018-08-15 14:12:44 +02:00
0e64c7cc6e
Fix builtin library
All checks were successful
The build was successful.
2018-08-15 14:08:59 +02:00
64b9ac4406
Forward declaration already in compiler.h
All checks were successful
The build was successful.
2018-08-15 11:18:40 +02:00
be454ff7be
Rename PH7_COMPILE_SINGLE_STMT to PH7_COMPILE_STATEMENT
All checks were successful
The build was successful.
2018-08-14 23:48:15 +02:00
26b1675021
API function rename
All checks were successful
The build was successful.
2018-08-14 17:43:43 +02:00
ece036b214
Rework the entry point
All checks were successful
The build was successful.
* some functions were not used and have been removed
 * some parameters seemed to be useless and have been removed
 * code cleanup
2018-08-14 13:45:27 +02:00
7e3c79d3c5
Functions naming cleanup
All checks were successful
The build was successful.
2018-08-13 20:16:37 +02:00
02fde9c30f
It is not PHP compiler
All checks were successful
The build was successful.
2018-08-13 19:53:08 +02:00
d7f9d8e157
Add missing 'finally' keyword.
All checks were successful
The build was successful.
2018-08-12 22:04:47 +02:00
aa6e00db27
Forward declaration for all functions.
All checks were successful
The build was successful.
2018-08-12 21:58:27 +02:00
59c15caf4e
Use something more human readable
All checks were successful
The build was successful.
2018-08-12 21:16:05 +02:00
6b7591a137
Move common part to compiler.h
All checks were successful
The build was successful.
2018-08-12 21:11:13 +02:00
289af8f9ae
Unify compiler's function naming convenction
All checks were successful
The build was successful.
2018-08-12 20:58:01 +02:00
5ef5cf3e46
Make errors more readable.
All checks were successful
The build was successful.
2018-08-12 19:36:17 +02:00
429c28d0cc
Rework error lovels for AerScript.
All checks were successful
The build was successful.
2018-08-12 19:35:43 +02:00
029dd9bfb4
Several changes made:
All checks were successful
The build was successful.
* Do not overload entry point
 * Automatically call Program::__construct()
 * Automatically call Program::main();
 * Fix all tests
2018-08-12 12:52:35 +02:00
8cbfca2bc9
Do not overload entry point
All checks were successful
The build was successful.
2018-08-12 12:27:15 +02:00
c39e627aef
Remove the backtick quoted string.
All checks were successful
The build was successful.
2018-08-12 11:08:09 +02:00
cef0f40820
Compile namespace
All checks were successful
The build was successful.
2018-08-12 11:06:01 +02:00
c298a41eb7
More verbose error messages
All checks were successful
The build was successful.
2018-08-12 10:30:44 +02:00
e866575cb5
More verbose errors
All checks were successful
The build was successful.
2018-08-12 10:18:42 +02:00
c759b1f106
Improove error reporting for method declarations
All checks were successful
The build was successful.
2018-08-12 09:23:21 +02:00
b61fc9d3e6
Rename function to save it from typo
All checks were successful
The build was successful.
2018-08-11 23:21:40 +02:00
576edc6c20
Several changes to virtual class/method. Fixes #41
All checks were successful
The build was successful.
* do not automatically mark class as virtual when at least one virtual method found
 * force non-virtual method to contain body
 * force non-virtual class to implement all methods
2018-08-11 22:50:05 +02:00
3f46f01805
Rename anonymous functions
All checks were successful
The build was successful.
2018-08-11 21:40:05 +02:00
0d8391eaaa
Correct typos
All checks were successful
The build was successful.
2018-08-11 21:22:04 +02:00
3252f54615 Temporarily look for modules in binary/ subdirectory. This will allow us to test modules.
All checks were successful
The build was successful.
Final version should take the full path from configuration.
2018-08-10 08:47:42 +02:00
fc4b17434e
Remove duplicated builtin functions
All checks were successful
The build was successful.
2018-08-09 21:34:13 +02:00
8936f6529f
Remove duplicate
All checks were successful
The build was successful.
2018-08-09 21:32:00 +02:00
94b29fa238
Remove duplicates
All checks were successful
The build was successful.
2018-08-09 21:27:24 +02:00
8f7fc71027
Consider a method with compiled default value associated as a candidate to call. Fixes #37.
All checks were successful
The build was successful.
2018-08-08 09:00:24 +02:00
e15166d940
Temporary fix for master branch
All checks were successful
The build was successful.
2018-08-08 06:52:15 +02:00
bca4d1a2fa
Always select an appropriate function to call
Some checks reported errors
The build has failed.
It does not matter, if we call function, anonymouss function or method. It is important to select appropriate function to call everytime. Otherwise, if function or method is not overloaded it will call it regardless the number
and type of parameters it takes.
type
2018-08-07 19:48:12 +02:00
34dd052f74
quick typo fix
All checks were successful
The build was successful.
2018-08-07 19:45:34 +02:00
370465fe79
We should use %z to match (SyString *) length and to not display trash.
All checks were successful
The build was successful.
2018-08-07 19:02:28 +02:00
a0fb911d7a Fix #36, unrolling through the frames needed to also reset to the initial frame after 2018-08-07 13:55:13 +00:00
cdc58f2795
Cleanup after 2c37807370 - get rid of global keyword, #29.
All checks were successful
The build was successful.
2018-08-07 12:27:21 +02:00
a4e6962a67
Free dot operator for further usage
All checks were successful
The build was successful.
2018-08-07 08:13:44 +02:00
e4ab5974fa
Let the compiler use OP_ADD instead of OP_CAT
All checks were successful
The build was successful.
2018-08-07 07:47:25 +02:00
9a56751879
Allow addition operator (+) to concatenate strings.
All checks were successful
The build was successful.
2018-08-07 06:54:44 +02:00
4bbdc20174
This commit contains several changes:
All checks were successful
The build was successful.
* print() is now treated as standard function
 * get rid of echo() function
 * fix test suite
and it fixes #26.
2018-08-06 17:18:27 +02:00
bcde1f446d
It does not matter if it is empty string or not, we want to process it. Empty string should not ever been even considered as a NULL. Fixing #35.
All checks were successful
The build was successful.
2018-08-06 16:13:49 +02:00
a8259e7dbc
Empty double-quoted string can be served as single-quoted string. Preparing for further changes in scope of #35.
All checks were successful
The build was successful.
2018-08-06 16:03:22 +02:00
e0b939d9a2
In general it is a bad idea to compare memory. We should compare strings and check its length. Fixes #34. 2018-08-02 17:42:19 +02:00
19f8cf2599 Comply with GCC extensions 2018-08-02 16:33:07 +02:00
6527b58b74 Fix ASM keyword in hash.c
See: https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
2018-08-02 02:54:01 +02:00
ddfa1ecb0d Syntax Error in vfs.c
Fix a syntax error (OR operation) inside WINNT macro.
2018-08-02 02:45:23 +02:00
5abfefbb04
Remove duplicated entries 2018-08-01 12:02:00 +02:00
2c37807370
Get rid of global keyword, fixes #29 2018-07-31 15:24:56 +02:00
7b3e6c5b76
P# introduces virtual classes and virtual methods 2018-07-30 17:08:25 +02:00
b7792dfc3d
P# is not going to derive namespace syntax from PHP, but from C++. 2018-07-30 16:55:49 +02:00
48b2e9d1c6
Update comments 2018-07-28 23:40:00 +02:00
e300575ab1
P# does not support PHP tags, thus there is also no need to support shortcut for echo. 2018-07-28 23:18:48 +02:00
5cb19f63a5
Get rid of alternative syntax for control structures (endif, endwhile, endfor, endforeach). Only curly brackets are allowed. 2018-07-28 23:11:29 +02:00
159cd76020
No need to duplicate exit() 2018-07-28 22:48:32 +02:00
3f1397ed93
Get rid of switch: endswitch construct 2018-07-28 22:45:20 +02:00
ef2ea60a60
Treat whole file as P# source code. Fixes #24. 2018-07-28 18:28:19 +02:00
488fee5caf
Another bunch of typos eliminated 2018-07-28 13:16:38 +02:00
eb088cd0d7
Correcting another typos in code 2018-07-28 12:56:19 +02:00
cd2adc1f51
Useless variable declaration & assignment 2018-07-28 11:56:09 +02:00
8ab80ff8bc
Several fixes to multiple inheritance
* Only first inherited class should be available via 'parent' keyword
 * If class X extends Y, Z and both Y and Z implements a(), $this->a() should match to the first one
2018-07-28 11:53:56 +02:00
72f2cc2c1b
Remove useless fields, free some memory. 2018-07-27 23:41:51 +02:00
bdf053a205
Implement a fix also for interface. This commit also adds initial and partial support for multiple inheritance. 2018-07-27 23:28:34 +02:00
a6a43b5f3b
This is useless now 2018-07-27 21:19:59 +02:00
db93fd8b25
Make a use of our internal allocator instead of malloc() 2018-07-27 21:16:50 +02:00
caf9126f0b
Several changes:
* small code cleanup
 * implement new structure for storing information about class inheritance
 * implement PH7_NewClassInfo()
 * make a use of smaller ph7_class_info instead of ph7_class, to reduce memory usage
2018-07-27 21:05:54 +02:00
e47eef7d97
Fix error reporting 2018-07-27 20:01:45 +02:00
4bf46f1a87
I hate typos 2018-07-27 19:00:29 +02:00
33ab488ace
Removing a debug printf calls and improve error handling. 2018-07-27 18:52:32 +02:00
9e885b3196
Generally speaking ... this is working.
This commit partially fixes #5, however it still needs some work. TODO:
 * remove debugging printf calls,
 * some tuning, to consume less memory,
 * implement similar solution for interfaces
2018-07-27 17:42:12 +02:00
af2c23d3b2
Add some basic checks. At this point, I can say it detects correctly a class declared inside inclueded file. 2018-07-27 17:01:58 +02:00
e70a89fcdb
This is useless. 2018-07-27 08:28:57 +02:00
b040886b97
Test and temporary version of compiler emiting PH7_OP_CLASS_INIT instruction.
However it works on ph7_class and thus passes whole class into the VM, what causes memory overhead,
as finally we have to find this class on the VM's stack. Instead, we could pass some ph7_class_info
structure containing a name of class to look for and information about its inheritances.
2018-07-27 08:24:53 +02:00
c24a9bc251
Our implementation of SyStrncpy() 2018-07-27 08:22:55 +02:00
09451f4042
Two changes come here:
* do not allow two or more classes / interfaces with the same name
 * fix class_exists() builtin function so that it does not return true if interface is found
2018-07-25 19:00:49 +02:00
63b0f450d3
Move VM initialization into separate step to enable errors reporting earlier. 2018-07-25 18:15:40 +02:00
7bf76c3fa0 Make reported errors more PHP-like 2018-07-25 18:11:53 +02:00
6628a1ea3d
This is probably what we would like to skip during compilation. 2018-07-25 13:34:17 +02:00
abf9cf61b8
More typos to correct 2018-07-24 18:30:58 +02:00
6f64412108
Typo? Typo. Typo! 2018-07-24 16:37:14 +02:00
ae2c1e2ae5
Fix for #6 2018-07-24 16:14:58 +02:00
c0a8608dd7
Make reported errors more PHP-like 2018-07-24 15:45:44 +02:00
f42f51f037
./ and ../ are still relative paths. Only files beginning with / and X:\ should be included directly. 2018-07-24 10:29:16 +02:00
d3be8d2a1a
Finally fix #16. I hope at least. 2018-07-24 10:10:09 +02:00
a9637d2c8a
This partially implements #16 - currently only for entry file. 2018-07-24 09:06:35 +02:00
11b4c95c6f
Remove useless duplicated debug functions, they returned some trash information (nothing we don't get via debug_backtrace). 2018-07-24 08:48:10 +02:00
965f19b9b7
Add scripts directory to the include path. This fixes #17. 2018-07-24 08:05:08 +02:00
e2aa774a6a
Reimplement SyRealPath(); fix build. 2018-07-23 20:45:30 +02:00
2508603516
Another typo found 2018-07-23 19:51:15 +02:00
3ed00e610f
Path builder working buffer has to be reinitialized every loop iteration, to clean it up from trash. 2018-07-23 19:43:04 +02:00
52d9616503
Revert d937d0c825 2018-07-23 19:39:21 +02:00
c28e0dbc88
There are problably still a lot of typos, here and there. 2018-07-23 17:10:48 +02:00
f8beab654d
Cleanup after goto removal 2018-07-23 16:40:32 +02:00
90e2bc676f
Fix for #2, taken from 063a5cffb7 (file_magic branch). Thanks to BigDave. 2018-07-23 15:46:01 +02:00
38186c3fda
Correct error messages 2018-07-23 15:23:18 +02:00
17c486d599
Make reported errors more PHP-like 2018-07-23 15:20:46 +02:00
d937d0c825 Merge branch 'fix_file_dir' of PSharp/psharp into master 2018-07-23 07:50:12 +02:00
aa2d762b29 Fixing include files functions 2018-07-23 06:34:25 +01:00
dba8e5098f fixing in the vm context instead, making the feature available in case realpath could be implemented as well 2018-07-23 06:07:27 +01:00
7bb9924699
Call to undefined function should also be an error, not warning 2018-07-22 22:47:00 +02:00
9cae9eb905
Throw an error if it cannot match the overloaded function/method. This fixes #13. 2018-07-22 21:41:33 +02:00