Rafal Kupiec
c206011c95
Rework PH7_ClassExtractAttribute() function. Now it returns a pointer to valid attribute.
2019-05-29 20:02:49 +02:00
Rafal Kupiec
8847d645c0
More corrections to error messages.
2019-05-29 20:01:32 +02:00
Rafal Kupiec
1c0ba22c48
Check access level for static methods call.
2019-05-29 19:05:34 +02:00
Rafal Kupiec
7732a239ff
Correct error messages.
2019-05-29 18:56:57 +02:00
Rafal Kupiec
5e166492d5
Revert 02471b4ccb
.
2019-05-29 18:46:31 +02:00
Rafal Kupiec
a5fb8ff8be
VmClassMemberAccess() should only check access right.
...
There is no need for this function to report errors. Function should have responsibility over a single part of the functionality provided. This change also corrects some error messages.
2019-05-29 15:26:31 +02:00
Rafal Kupiec
a6f7c6d847
Prevent $base, $parent and $this from being unset.
2019-05-29 13:45:38 +02:00
Rafal Kupiec
02471b4ccb
Do not install private methods from parent to subclass.
...
All methods defined in superclass can be access by $this and $parent construct. There is no need to copy private methods, as they cannot be access in $this context.
2019-05-29 13:25:17 +02:00
Rafal Kupiec
28e18bcb4b
Attempt to fix attributes lookup and their visibility.
2019-05-29 10:45:30 +02:00
Rafal Kupiec
2d50a64cac
AerScript supports multiple inheritance, thus it needs to iterate through whole list of derived classes.
2019-05-29 08:52:43 +02:00
Rafal Kupiec
4d1c246a65
Attempt to fix methods visibility mechanism.
2019-05-29 08:17:10 +02:00
Rafal Kupiec
1f5afc9d51
Reverse the logic. It does not seem to work actually.
2019-05-29 08:10:34 +02:00
Rafal Kupiec
675f3596a1
Properly look for method in all classes.
2019-05-29 06:12:49 +02:00
Rafal Kupiec
26333360b0
Fix similar to a25b163af6
.
2019-05-28 20:04:23 +02:00
Rafal Kupiec
b319e11c09
Fix build.
2019-05-28 11:55:17 +02:00
Rafal Kupiec
5c176207e1
Set base class only when $base called.
2019-05-28 11:51:13 +02:00
Rafal Kupiec
5cc4a5e48d
Access privileges to methods should be done in OP_MEMBER.
2019-05-23 08:27:56 +02:00
Rafal Kupiec
e654e42b07
Store class directly in function container.
2019-05-22 08:33:56 +02:00
Rafal Kupiec
5b2f300fe4
Implement '$base' construction.
2019-05-21 21:41:16 +02:00
Rafal Kupiec
ddd46a4e80
Quick small cleanup.
2019-05-21 19:18:52 +02:00
Rafal Kupiec
3cca5faa76
Store variable type in dedicated field.
2019-05-21 14:49:36 +02:00
Rafal Kupiec
9fd61a207b
Store class pointer in attribute during installation.
2019-05-21 08:42:45 +02:00
Rafal Kupiec
1acbd21caf
Store a pointer to class container in each method.
2019-05-21 08:40:10 +02:00
Rafal Kupiec
a25b163af6
Fix another PH7 conceptual bug. Reverse this logic.
2019-05-18 13:42:30 +02:00
Rafal Kupiec
77c57674e8
Allow private methods redeclaration.
2019-05-17 19:54:32 +02:00
Rafal Kupiec
4cc7940216
Correctly identify a member.
2019-05-17 09:05:17 +02:00
Rafal Kupiec
55acf8111f
Assume private visibility for all class members by default.
...
In most (all?) modern OOP languages class members visibility is assumed to be private and programmer has to consciously set it to public or protected. PHP has the different approach what can cause a security flaws in written scripts. AerScript will not follow this way, as it seems to be conceptually broken.
2019-05-17 08:40:41 +02:00
Rafal Kupiec
48ccd7fef0
Copy all attributes from base classes and emit a warning if redeclared in subclass.
2019-05-17 06:52:29 +02:00
Rafal Kupiec
e8c675bd8e
Store a pointer to class container to reduce memory usage.
2019-05-16 15:41:37 +02:00
Rafal Kupiec
7203492763
Store a class name in each attribute.
2019-05-16 13:25:06 +02:00
Rafal Kupiec
f2116a6461
Always use HTTPS when possible.
2019-05-15 20:02:39 +02:00
Rafal Kupiec
5d9b73ba4e
Use method full name.
2019-05-15 19:45:39 +02:00
Rafal Kupiec
5256dda922
Attempt to fix '$this' and '$parent' constructs.
2019-05-10 23:45:32 +02:00
Rafal Kupiec
ea5499f8b3
Private methods should not be accessible from child class.
2019-05-09 13:53:22 +02:00
Rafal Kupiec
5e7d5957e2
Distinguish methods from attributes.
2019-05-09 13:43:01 +02:00
Rafal Kupiec
d3d3dff673
Do not allow to call statically a non-static method.
2019-05-09 06:18:49 +02:00
Rafal Kupiec
a2fb0b9ae5
Get rid of 'parent' constant. Use variable instead.
2019-05-08 08:38:40 +02:00
Rafal Kupiec
07bd3ceec3
Reimplement 'parent' construct as variable $parent.
...
This commit also adds new controls to variables, which prevents from re-assigning a value when set. Thanks to that, both $this and $parent cannot be overwritten by using OP_STORE instruction. Other instructions still need some
work.
2019-05-08 08:26:48 +02:00
Rafal Kupiec
17e0fb4653
Do not try to resolve constants when OP_MEMBER is next instruction on the stack.
2019-05-06 18:42:06 +02:00
Rafal Kupiec
d3ae1c1bf4
Only identifiers should be allowed as constant name.
2019-05-06 18:38:56 +02:00
Rafal Kupiec
cedc288f67
Remove static constant.
2019-05-06 11:42:19 +02:00
Rafal Kupiec
0a6b5a6f42
The 'self' and 'parent' keywords should be resolved at compile time.
2019-05-06 11:38:32 +02:00
Rafal Kupiec
7b6245572f
Remove constants management builtin functions.
2019-05-06 06:54:29 +02:00
Rafal Kupiec
c4b63a3018
Rename OP_LOAD instruction to OP_LOADV.
2019-05-05 09:33:06 +02:00
Rafal Kupiec
23900f2aed
Remove unused compiler function - PH7_CompileLangConstruct().
...
In AerScript, there are no such language constructs, that have syntax similiar to functions. If so, it is just a builtin function.
2019-05-04 18:53:11 +02:00
Rafal Kupiec
b36510943d
Implement 'define' statement for defining constants globally.
2019-05-04 17:08:09 +02:00
Rafal Kupiec
ab8bf48485
Make constant declarations local.
...
There are several changes in this commit:
* first of all constants declared by 'const' statement should be local (declared in current scope / frame),
* constants are declared by using OP_DECLARE instruction,
* OP_LOADC browses both global and local constants container,
* PH7_VmRegisterConstant() allows both global and local declarations.
Since this commit, there are 3 kinds of constants:
1) global
2) local (in loop, closure, method)
3) class members.
Actually there is no way to declare a global constant except the built-in constants.
2019-05-04 13:45:32 +02:00
Rafal Kupiec
e6b7f1be2c
Always emit OP_JMPLFE as goto can be used inside a loop and frame has to be left.
2019-05-03 10:55:57 +02:00
Rafal Kupiec
03fc167be1
Proper implementation of so hated 'goto' statement.
2019-05-03 10:35:54 +02:00
Rafal Kupiec
2f3ce65289
Correct comment to if/else statements.
2019-05-02 19:03:47 +02:00
Rafal Kupiec
8f681d1605
Correct PH7_OP_JMPLFE debug name.
2019-05-01 20:24:37 +02:00
Rafal Kupiec
5a0e4667fa
More readable error message.
2019-05-01 20:09:55 +02:00
Rafal Kupiec
508e8965a9
VmExtractMemObj() should not be able to create a variable.
2019-05-01 18:29:57 +02:00
Rafal Kupiec
7d606cbf1d
Do not create variables automatically on each OP_CALL using VmExtractMemObj().
2019-05-01 18:19:04 +02:00
Rafal Kupiec
3dfa4232ba
Use VmCreateMemObj() to create $this.
2019-05-01 14:00:35 +02:00
Rafal Kupiec
7c37451520
Namespaces are not supported and broken, but compile them properly.
2019-05-01 13:49:07 +02:00
Rafal Kupiec
1829eff323
Fix interface and class compilation.
2019-05-01 13:37:14 +02:00
Rafal Kupiec
798fd7d3b2
Remove unused and useless VM instruction.
2019-05-01 12:33:51 +02:00
Rafal Kupiec
d76441ad4c
Safely store only compatible values.
2019-05-01 12:24:20 +02:00
Rafal Kupiec
1d6822c1e2
Allow key and value declaration inside foreach() loop.
2019-05-01 11:38:28 +02:00
Rafal Kupiec
a726ab795a
Throw an error if $key or $value does not exist.
2019-05-01 09:51:33 +02:00
Rafal Kupiec
5c1e0f0cce
Simplify the foreach() loop implementation.
2019-04-30 23:59:02 +02:00
Rafal Kupiec
4d8d92092e
Refactor foreach() loop.
...
In AerScript, the foreach() loop is syntatically more similiar to C#, than PHP. However the optional '$key => $value' construct is still available, because arrays in AerScript are still a hashmaps.
2019-04-30 23:38:59 +02:00
Rafal Kupiec
1156519af6
This is a compiler task to fill key and value variables names.
2019-04-29 11:44:17 +02:00
Rafal Kupiec
62c315da9e
Call to undefined constant should lead to an error.
2019-04-28 21:44:48 +02:00
Rafal Kupiec
f09d4def2d
It's AerScript.
2019-04-28 19:47:09 +02:00
Rafal Kupiec
d6fca929ea
Callbacks can be just called.
2019-04-28 19:36:27 +02:00
Rafal Kupiec
6593252bce
Remove get_defined_functions() built-in function.
...
This function is useless in Aer, as it is fully OOP language and thus disallows functions declaration.
2019-04-28 19:31:58 +02:00
Rafal Kupiec
d26bc99b68
There is no reason to trigger a low-level error in AerScript.
...
AerScript is fully OOP language and supports exceptions that can be thrown at any time.
2019-04-28 19:27:24 +02:00
Rafal Kupiec
00c502c11b
Get rid of import_request_variables() builtin function. Its pure evil.
2019-04-28 19:23:42 +02:00
Rafal Kupiec
9f4f6298c2
Do not create variable in foreach() loop automatically.
2019-04-28 19:14:56 +02:00
Rafal Kupiec
eef5ee370d
Remove this useless wrapper function.
2019-04-28 18:25:43 +02:00
Rafal Kupiec
8ab3919688
Class names should be case sensitive.
2019-04-28 18:24:22 +02:00
Rafal Kupiec
58015f2a20
Correct typo.
2019-04-28 18:18:03 +02:00
Rafal Kupiec
d72774f0f4
Namespaces in AerScript do not support aliases.
2019-04-25 23:31:48 +02:00
Rafal Kupiec
407fb09e8f
Throw an error only if this is not the end of tokens stream.
2019-04-25 19:24:53 +02:00
Rafal Kupiec
cb455c3c73
Unify compiler OOM error messages.
2019-04-24 23:52:48 +02:00
Rafal Kupiec
1c5982e764
There is no reason to use a loop here.
2019-04-24 23:45:46 +02:00
Rafal Kupiec
3be46532dd
Remove unused PH7_ErrorRecover() function.
2019-04-24 23:38:45 +02:00
Rafal Kupiec
c443a38fec
Do not count compilation errors.
...
Interpreter will abort script execution on first error found.
2019-04-24 23:22:06 +02:00
Rafal Kupiec
48a38dc1af
PH7_GenCompileError() always breaks script execution on E_ERROR.
...
Thus code placed below will never get executed and is completely useless.
2019-04-24 23:12:59 +02:00
Rafal Kupiec
7c8259057b
PH7_VmThrowError() always breaks script execution on PH7_CTX_ERR.
...
Thus code placed below will never get executed and is completely useless.
2019-04-24 18:30:24 +02:00
Rafal Kupiec
9b1ad67580
PH7_VmThrowError() always breaks script execution on PH7_CTX_ERR.
...
Thus code placed below will never get executed and is completely useless.
2019-04-24 18:09:41 +02:00
Rafal Kupiec
deda6b4b15
PH7_GenCompileError() always breaks script execution on E_ERROR.
...
Thus code placed below will never get executed and is completely useless.
2019-04-24 18:03:57 +02:00
Rafal Kupiec
5b0b965199
Fix segmentation fault when trying to clone non-instantiated object.
2019-04-24 16:51:43 +02:00
Rafal Kupiec
555234e381
Get rid of variable variables. AerScript does not support it.
2019-04-22 12:01:11 +02:00
Rafal Kupiec
8f18ebf884
Update legal info.
2019-04-20 19:53:16 +02:00
Rafal Kupiec
c9203b6c91
New source code legal format.
2019-04-20 19:29:15 +02:00
Rafal Kupiec
ed8f3f341e
Remove array_same() builtin function.
...
After last change, AerScript does not pass arrays as reference, so there is no chance to get this function return true, unless you pass array as reference.
2019-04-20 13:59:10 +02:00
Rafal Kupiec
18e77b9754
array_copy() is no longer needed.
...
AerScript makes a copy of all arrays, except a situation when array is passed by reference. Thanks to that this ugly hack called an extension, introduced by Symisc can be removed.
2019-04-20 07:30:07 +02:00
Rafal Kupiec
d819820798
Always make an array copy. Fixes #48 .
2019-04-20 07:19:35 +02:00
Rafal Kupiec
e794ffd97b
Fix PH7_HashmapDup().
...
This function needs to store the next index. Otherwise it will start to count from beginning, duplicating existing keys.
2019-04-19 20:16:42 +02:00
Rafal Kupiec
a0405f2267
Always perform type validation when inserting value to an array.
2019-04-19 07:08:29 +02:00
Rafal Kupiec
291b6f0607
Get rid of backstick quoted strings (shell commands).
2019-04-18 06:48:51 +02:00
Rafal Kupiec
0e8a2372dd
Cleanup lexer from no longer used operators.
2019-04-18 06:20:08 +02:00
Rafal Kupiec
929d7b83fe
Cleanup unused functions.
2019-04-17 18:40:14 +02:00
Rafal Kupiec
407bcf5a29
Fix segmentation fault on Program::__construct() call.
2019-04-17 17:29:05 +02:00
Rafal Kupiec
9a82298451
Do not check parameters passed to constructor.
...
There is no need to check parameters passed to constructor and emit a notice, because PH7_VmCallClassMethod() does the job. It tries to find a matching method if overloaded and checks all arguments passed. In case of any
problems, it emits E_ERROR.
2019-04-17 12:18:55 +02:00
Rafal Kupiec
bd22425b46
Do not allow 'continue' statement in a switch case.
...
Important rule while using continue statement is that, We can use continue
statement only within the loops. Switch case is conditional block not a loop
so we cannot execute the continue statement inside switch.
2019-04-17 11:13:29 +02:00
Rafal Kupiec
5f57ba54a4
Left operand must be modifiable when storing some value.
2019-04-17 08:59:42 +02:00
Rafal Kupiec
395f6c446c
Get rid of known from PHP 'elseif' construction.
2019-04-17 07:55:32 +02:00
Piotr Likoski
6b18e204cd
Always pop the l-value on variable declaration.
...
Otherwise, it might lead to unexpected behaviour including protected memory access and segmentation fault.
This finally fixes #49 .
2019-04-16 20:15:38 +02:00
Rafal Kupiec
88d382b76b
Add missing VM OP descriptions.
2019-04-16 19:12:39 +02:00
Rafal Kupiec
07e3a09999
Enter and leave a loop frame on every iteration.
...
This fixes strict variable declaration inside loops.
2019-04-16 13:51:58 +02:00
Rafal Kupiec
ba8e9080ef
Implement OP_JMPLFB & OP_JMPLFE VM instructions.
2019-04-16 12:46:58 +02:00
Rafal Kupiec
ef4f994e8b
Do not allow 'break' statement to take a parameter. This is strange construction introduced in PHP.
2019-04-16 12:34:53 +02:00
Rafal Kupiec
5fddbf8737
Do not allow 'continue' statement to take a parameter. This is strange construction introduced in PHP.
2019-04-16 12:32:01 +02:00
Rafal Kupiec
89f19133d5
Rename VM's jump instructions for better readability.
2019-04-16 08:14:16 +02:00
Rafal Kupiec
eb80dced3e
Correct comment.
2019-04-15 20:00:54 +02:00
Rafal Kupiec
f9b518138e
Cleanup OP_LOAD instruction.
2019-04-15 19:44:49 +02:00
Rafal Kupiec
517dffcbc1
Separate VM instruction for variable declaration (OP_DECLARE).
2019-04-15 19:18:29 +02:00
Rafal Kupiec
1b248a17e7
Query the top active as well as all loop frames.
2019-04-15 18:32:30 +02:00
Rafal Kupiec
661158d249
Simply throw memory error.
2019-04-15 17:41:29 +02:00
Rafal Kupiec
94e06f3d3a
Do not duplicate the code; make a use of VmCreateMemObj().
2019-04-15 17:14:14 +02:00
Rafal Kupiec
9e06322b57
Implement VmCreateMemObj().
2019-04-15 17:04:44 +02:00
Rafal Kupiec
c51b3dfa8a
Revert 89d5158d7e
and a8a1a2cd51
. Fix should be based on VM frames.
2019-04-13 14:39:57 +02:00
Rafal Kupiec
89d5158d7e
Fix build.
2019-04-11 13:31:17 +02:00
Rafal Kupiec
a8a1a2cd51
Fix variable declaration in loops.
2019-04-11 13:28:47 +02:00
Rafal Kupiec
ee0d189f0a
Add comments.
2019-04-11 11:37:07 +02:00
Rafal Kupiec
cdc0dade2a
Allow to store a character in string variable.
2019-04-11 11:33:00 +02:00
Rafal Kupiec
4eaf6a7117
AerScript is strict type hinting language, thus OP_TEQ & OP_TNE are not needed here.
2019-04-11 06:25:20 +02:00
Rafal Kupiec
2a4e47e782
I hope this finally fixes the default argument value.
2019-04-10 18:32:53 +02:00
Rafal Kupiec
527a6ad689
Mark argument as well as object, when class name is supplied.
2019-04-10 13:58:24 +02:00
Rafal Kupiec
95c9fd0f1f
Corrections in builtin library.
2019-04-10 12:44:44 +02:00
Rafal Kupiec
d8f9db8f9a
Proper implementation of is_callback() & is_callable(). First one only performs a check if variable type is callback, while the second checks if function exists and if can be called.
2019-04-10 09:45:00 +02:00
Rafal Kupiec
65e38a364d
Do not try to call an array.
2019-04-10 09:26:06 +02:00
Rafal Kupiec
d6434ba19e
Try to report some line.
2019-04-10 09:18:26 +02:00
Rafal Kupiec
447910ce2e
Fix callbacks.
2019-04-10 09:08:10 +02:00
Rafal Kupiec
f0e50678e3
Optimize the code a bit.
2019-04-10 08:52:06 +02:00
Rafal Kupiec
8810a86a2c
Fix for typoecasting callback to string.
2019-04-10 08:50:04 +02:00
Rafal Kupiec
b0165e5702
Do not reset blob when typecasting from string to callback.
2019-04-10 06:57:14 +02:00
Rafal Kupiec
77ebce7acf
Parser takes care about nested arrays.
2019-04-10 06:18:49 +02:00
Rafal Kupiec
77795bea4c
Do not check for return value on OP_DONE.
2019-04-08 13:51:54 +02:00
Rafal Kupiec
598dc9ce51
At least try to call callback and do not check for return value on OP_DONE.
2019-04-08 13:49:12 +02:00
Rafal Kupiec
d74b182235
Properly typecast callback to boolean.
2019-04-08 13:32:50 +02:00
Rafal Kupiec
1679420f4c
Get rid of some invisible escape characters.
2019-04-06 17:00:15 +02:00
Rafal Kupiec
d34c8ceafb
Fix void dump.
2019-04-06 16:51:32 +02:00
Rafal Kupiec
7443663dd8
Fixes in PH7_OP_LOAD_IDX instruction.
2019-04-06 09:36:08 +02:00
Rafal Kupiec
f6e2b549b6
Access to undefined array index should be reported as error.
2019-04-06 09:21:09 +02:00
Rafal Kupiec
72c420cc85
Correct another typo.
2019-04-05 20:21:26 +02:00
Rafal Kupiec
a501dea661
Fix a typo.
2019-04-05 20:17:44 +02:00
Rafal Kupiec
25001ae746
This should be an error, really.
2019-04-05 20:14:08 +02:00
Rafal Kupiec
2de455aa01
Fix formatting.
2019-04-05 20:12:55 +02:00
Rafal Kupiec
95fba30f9b
Better way to check arguments compatibility.
2019-04-05 20:07:56 +02:00
Rafal Kupiec
a06573408e
Better way to check arguments compatibility.
2019-04-05 19:59:15 +02:00
Rafal Kupiec
39f698476f
This is not the right way to go - revert 465336b23b
.
2019-04-05 12:30:38 +02:00
Rafal Kupiec
465336b23b
Mark void variable as well as NULL, and dump NULL as void.
2019-04-05 11:52:15 +02:00
Rafal Kupiec
a1151d598b
Do not emit warning when assigning NULL to resource.
2019-04-05 11:42:40 +02:00
Rafal Kupiec
fcd4e8d6a6
The readdir() function should return empty string instead of false.
2019-04-05 07:54:47 +02:00
Rafal Kupiec
72dc44c152
Another fix for OP_DONE instruction.
2019-04-05 07:45:53 +02:00