@@ -33,15 +33,17 @@ discard block |
||
33 | 33 | $name = $node->args['name']; |
34 | 34 | $args = []; |
35 | 35 | |
36 | - if (isset (self::$objects[$name])) |
|
37 | - break; |
|
36 | + if (isset (self::$objects[$name])) { |
|
37 | + break; |
|
38 | + } |
|
38 | 39 | |
39 | 40 | if (isset ($node->args['args'])) |
40 | 41 | { |
41 | 42 | $args = $node->args['args']; |
42 | 43 | |
43 | - foreach ($args as $arg_id => $arg) |
|
44 | - $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
44 | + foreach ($args as $arg_id => $arg) { |
|
45 | + $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
46 | + } |
|
45 | 47 | } |
46 | 48 | |
47 | 49 | try |
@@ -51,15 +53,12 @@ discard block |
||
51 | 53 | try |
52 | 54 | { |
53 | 55 | self::$objects[$name]->name = $name; |
54 | - } |
|
55 | - |
|
56 | - catch (\Throwable $e) {} |
|
57 | - } |
|
58 | - |
|
59 | - catch (\Throwable $e) |
|
56 | + } catch (\Throwable $e) {} |
|
57 | + } catch (\Throwable $e) |
|
60 | 58 | { |
61 | - if (self::$throw_errors) |
|
62 | - throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
59 | + if (self::$throw_errors) { |
|
60 | + throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
61 | + } |
|
63 | 62 | } |
64 | 63 | break; |
65 | 64 | |
@@ -78,13 +77,15 @@ discard block |
||
78 | 77 | $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos); |
79 | 78 | $use = explode (' ', $use); |
80 | 79 | |
81 | - foreach ($use as $id => $useParam) |
|
82 | - if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
|
80 | + foreach ($use as $id => $useParam) { |
|
81 | + if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
|
83 | 82 | { |
84 | 83 | $fname = $use[$id + 1]; |
84 | + } |
|
85 | 85 | |
86 | - if (substr ($fname, strlen ($fname) - 1) == ',') |
|
87 | - $fname = substr ($fname, 0, -1); |
|
86 | + if (substr ($fname, strlen ($fname) - 1) == ',') { |
|
87 | + $fname = substr ($fname, 0, -1); |
|
88 | + } |
|
88 | 89 | |
89 | 90 | $preset .= "$fname = $useParam; "; |
90 | 91 | |
@@ -93,27 +94,26 @@ discard block |
||
93 | 94 | |
94 | 95 | $preset = self::formatLine ($preset, self::$objects); |
95 | 96 | $propertyValue = self::formatLine (str_replace ($ouse, implode (' ', $use), $propertyValue), self::$objects); |
97 | + } else { |
|
98 | + $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
96 | 99 | } |
97 | 100 | |
98 | - else $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
99 | - |
|
100 | 101 | try |
101 | 102 | { |
102 | - if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls) |
|
103 | - eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
104 | - |
|
105 | - else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
|
106 | - } |
|
107 | - |
|
108 | - catch (\Throwable $e) |
|
103 | + if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls) { |
|
104 | + eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
105 | + } else { |
|
106 | + self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
|
107 | + } |
|
108 | + } catch (\Throwable $e) |
|
109 | 109 | { |
110 | - if (self::$throw_errors) |
|
111 | - throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
110 | + if (self::$throw_errors) { |
|
111 | + throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
112 | + } |
|
112 | 113 | } |
114 | + } elseif (self::$throw_errors) { |
|
115 | + throw new \Exception ('Setting property to an non-object at line "'. $node->line); |
|
113 | 116 | } |
114 | - |
|
115 | - elseif (self::$throw_errors) |
|
116 | - throw new \Exception ('Setting property to an non-object at line "'. $node->line); |
|
117 | 117 | break; |
118 | 118 | |
119 | 119 | case METHOD_CALL: |
@@ -124,29 +124,28 @@ discard block |
||
124 | 124 | $methodName = $node->args['name']; |
125 | 125 | $methodArgs = $node->args['args']; |
126 | 126 | |
127 | - foreach ($methodArgs as $arg_id => $arg) |
|
128 | - $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
127 | + foreach ($methodArgs as $arg_id => $arg) { |
|
128 | + $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
129 | + } |
|
129 | 130 | |
130 | 131 | try |
131 | 132 | { |
132 | - if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
133 | - eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
134 | - |
|
135 | - elseif (sizeof ($methodArgs) > 0) |
|
136 | - self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];')); |
|
137 | - |
|
138 | - else self::$objects[$name]->$methodName (); |
|
139 | - } |
|
140 | - |
|
141 | - catch (\Throwable $e) |
|
133 | + if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) { |
|
134 | + eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
135 | + } elseif (sizeof ($methodArgs) > 0) { |
|
136 | + self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];')); |
|
137 | + } else { |
|
138 | + self::$objects[$name]->$methodName (); |
|
139 | + } |
|
140 | + } catch (\Throwable $e) |
|
142 | 141 | { |
143 | - if (self::$throw_errors) |
|
144 | - throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
142 | + if (self::$throw_errors) { |
|
143 | + throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
144 | + } |
|
145 | 145 | } |
146 | + } elseif (self::$throw_errors) { |
|
147 | + throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"'); |
|
146 | 148 | } |
147 | - |
|
148 | - elseif (self::$throw_errors) |
|
149 | - throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"'); |
|
150 | 149 | break; |
151 | 150 | |
152 | 151 | case STYLES_IMPORTING: |
@@ -156,11 +155,10 @@ discard block |
||
156 | 155 | |
157 | 156 | if (!file_exists ($path)) |
158 | 157 | { |
159 | - if (self::$throw_errors) |
|
160 | - throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"'); |
|
161 | - } |
|
162 | - |
|
163 | - elseif (!isset (self::$imported_styles[$path])) |
|
158 | + if (self::$throw_errors) { |
|
159 | + throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"'); |
|
160 | + } |
|
161 | + } elseif (!isset (self::$imported_styles[$path])) |
|
164 | 162 | { |
165 | 163 | \VLF\VST\Interpreter::run (\VLF\VST\Parser::parse (file_get_contents ($path))); |
166 | 164 | |
@@ -178,16 +176,17 @@ discard block |
||
178 | 176 | |
179 | 177 | if ($node->type == OBJECT_DEFINITION) |
180 | 178 | { |
181 | - if (isset (\VLF\VST\Interpreter::$default_styles[$node->args['class']])) |
|
182 | - $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$default_styles[$node->args['class']]); |
|
179 | + if (isset (\VLF\VST\Interpreter::$default_styles[$node->args['class']])) { |
|
180 | + $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$default_styles[$node->args['class']]); |
|
181 | + } |
|
183 | 182 | |
184 | - if (isset ($node->args['styles'])) |
|
185 | - foreach ($node->args['styles'] as $style) |
|
183 | + if (isset ($node->args['styles'])) { |
|
184 | + foreach ($node->args['styles'] as $style) |
|
186 | 185 | if (isset (\VLF\VST\Interpreter::$styles[$style])) |
187 | 186 | $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$styles[$style]); |
188 | - |
|
189 | - elseif (self::$throw_errors) |
|
190 | - throw new \Exception ('Trying to set undefined style "'. $style .'" to object at line "'. $node->line .'"'); |
|
187 | + } elseif (self::$throw_errors) { |
|
188 | + throw new \Exception ('Trying to set undefined style "'. $style .'" to object at line "'. $node->line .'"'); |
|
189 | + } |
|
191 | 190 | } |
192 | 191 | |
193 | 192 | self::$objects = self::run (new AST (array_map ( |
@@ -228,8 +227,9 @@ discard block |
||
228 | 227 | |
229 | 228 | $nReplacement = []; |
230 | 229 | |
231 | - foreach ($replacement as $replaceTo => $nLn) |
|
232 | - $nReplacement[$omap[$replaceTo]] = $replaceTo; |
|
230 | + foreach ($replacement as $replaceTo => $nLn) { |
|
231 | + $nReplacement[$omap[$replaceTo]] = $replaceTo; |
|
232 | + } |
|
233 | 233 | |
234 | 234 | $replacement = $nReplacement; |
235 | 235 | $blacklist = array_flip (['\'', '"', '$']); |
@@ -238,10 +238,11 @@ discard block |
||
238 | 238 | { |
239 | 239 | $replaced = false; |
240 | 240 | |
241 | - foreach ($replacement as $name => $replaceAt) |
|
242 | - if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
241 | + foreach ($replacement as $name => $replaceAt) { |
|
242 | + if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
243 | 243 | { |
244 | 244 | $newLine .= $replaceAt; |
245 | + } |
|
245 | 246 | |
246 | 247 | $i += $l - 1; |
247 | 248 | $replaced = true; |
@@ -249,8 +250,9 @@ discard block |
||
249 | 250 | break; |
250 | 251 | } |
251 | 252 | |
252 | - if (!$replaced) |
|
253 | - $newLine .= $line[$i]; |
|
253 | + if (!$replaced) { |
|
254 | + $newLine .= $line[$i]; |
|
255 | + } |
|
254 | 256 | } |
255 | 257 | |
256 | 258 | $line = $newLine; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | try |
101 | 101 | { |
102 | - if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls) |
|
102 | + if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls) |
|
103 | 103 | eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
104 | 104 | |
105 | 105 | else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
@@ -259,9 +259,9 @@ discard block |
||
259 | 259 | return $line; |
260 | 260 | } |
261 | 261 | |
262 | - public static function clear (): void |
|
263 | - { |
|
264 | - self::$objects = []; |
|
265 | - self::$imported_styles = []; |
|
266 | - } |
|
262 | + public static function clear (): void |
|
263 | + { |
|
264 | + self::$objects = []; |
|
265 | + self::$imported_styles = []; |
|
266 | + } |
|
267 | 267 | } |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | * |
23 | 23 | * @return array - возвращает список созданных объектов |
24 | 24 | */ |
25 | - public static function run (AST $tree, Node $parent = null): array |
|
25 | + public static function run(AST $tree, Node $parent = null): array |
|
26 | 26 | { |
27 | - foreach ($tree->getNodes () as $node) |
|
27 | + foreach ($tree->getNodes() as $node) |
|
28 | 28 | { |
29 | 29 | switch ($node->type) |
30 | 30 | { |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | $args = $node->args['args']; |
42 | 42 | |
43 | 43 | foreach ($args as $arg_id => $arg) |
44 | - $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
44 | + $args[$arg_id] = self::formatLine($arg, self::$objects); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | try |
48 | 48 | { |
49 | - self::$objects[$name] = eval ("namespace VoidEngine; return new $class (". implode (', ', $args) .");"); |
|
49 | + self::$objects[$name] = eval ("namespace VoidEngine; return new $class (".implode(', ', $args).");"); |
|
50 | 50 | |
51 | 51 | try |
52 | 52 | { |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | catch (\Throwable $e) |
60 | 60 | { |
61 | 61 | if (self::$throw_errors) |
62 | - throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
62 | + throw new \Exception('Interpeter couldn\'t create object "'.$class.'" with name "'.$name.'" at line "'.$node->line.'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
63 | 63 | } |
64 | 64 | break; |
65 | 65 | |
@@ -72,35 +72,35 @@ discard block |
||
72 | 72 | $propertyValue = $node->args['value']; |
73 | 73 | $preset = ''; |
74 | 74 | |
75 | - if (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
75 | + if (preg_match('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
76 | 76 | { |
77 | - $use = substr ($propertyValue, strpos ($propertyValue, 'use')); |
|
78 | - $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos); |
|
79 | - $use = explode (' ', $use); |
|
77 | + $use = substr($propertyValue, strpos($propertyValue, 'use')); |
|
78 | + $use = $ouse = substr($use, ($pos = strpos($use, '(') + 1), strpos($use, ')') - $pos); |
|
79 | + $use = explode(' ', $use); |
|
80 | 80 | |
81 | 81 | foreach ($use as $id => $useParam) |
82 | 82 | if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
83 | 83 | { |
84 | 84 | $fname = $use[$id + 1]; |
85 | 85 | |
86 | - if (substr ($fname, strlen ($fname) - 1) == ',') |
|
87 | - $fname = substr ($fname, 0, -1); |
|
86 | + if (substr($fname, strlen($fname) - 1) == ',') |
|
87 | + $fname = substr($fname, 0, -1); |
|
88 | 88 | |
89 | 89 | $preset .= "$fname = $useParam; "; |
90 | 90 | |
91 | 91 | unset ($use[$id]); |
92 | 92 | } |
93 | 93 | |
94 | - $preset = self::formatLine ($preset, self::$objects); |
|
95 | - $propertyValue = self::formatLine (str_replace ($ouse, implode (' ', $use), $propertyValue), self::$objects); |
|
94 | + $preset = self::formatLine($preset, self::$objects); |
|
95 | + $propertyValue = self::formatLine(str_replace($ouse, implode(' ', $use), $propertyValue), self::$objects); |
|
96 | 96 | } |
97 | 97 | |
98 | - else $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
98 | + else $propertyValue = self::formatLine($propertyValue, self::$objects); |
|
99 | 99 | |
100 | 100 | try |
101 | 101 | { |
102 | - if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls) |
|
103 | - eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
102 | + if (strpos($propertyName, '->') !== false && self::$allow_multimethods_calls) |
|
103 | + eval ('namespace VoidEngine; '.$preset.' _c('.self::$objects[$name]->selector.')->'.$propertyName.' = '.$propertyValue.';'); |
|
104 | 104 | |
105 | 105 | else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
106 | 106 | } |
@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | catch (\Throwable $e) |
109 | 109 | { |
110 | 110 | if (self::$throw_errors) |
111 | - throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
111 | + throw new \Exception('Interpeter couldn\'t set property "'.$propertyName.'" with value "'.$propertyValue.'" at line "'.$node->line.'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | |
115 | 115 | elseif (self::$throw_errors) |
116 | - throw new \Exception ('Setting property to an non-object at line "'. $node->line); |
|
116 | + throw new \Exception('Setting property to an non-object at line "'.$node->line); |
|
117 | 117 | break; |
118 | 118 | |
119 | 119 | case METHOD_CALL: |
@@ -125,44 +125,44 @@ discard block |
||
125 | 125 | $methodArgs = $node->args['args']; |
126 | 126 | |
127 | 127 | foreach ($methodArgs as $arg_id => $arg) |
128 | - $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
128 | + $methodArgs[$arg_id] = self::formatLine($arg, self::$objects); |
|
129 | 129 | |
130 | 130 | try |
131 | 131 | { |
132 | - if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
133 | - eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
132 | + if (strpos($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
133 | + eval ('namespace VoidEngine; _c('.self::$objects[$name]->selector.')->'.$methodName.' ('.implode(', ', $methodArgs).');'); |
|
134 | 134 | |
135 | - elseif (sizeof ($methodArgs) > 0) |
|
136 | - self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];')); |
|
135 | + elseif (sizeof($methodArgs) > 0) |
|
136 | + self::$objects[$name]->$methodName(...eval ('namespace VoidEngine; return ['.implode(', ', $methodArgs).'];')); |
|
137 | 137 | |
138 | - else self::$objects[$name]->$methodName (); |
|
138 | + else self::$objects[$name]->$methodName(); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | catch (\Throwable $e) |
142 | 142 | { |
143 | 143 | if (self::$throw_errors) |
144 | - throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
144 | + throw new \Exception('Interpeter couldn\'t call method "'.$methodName.'" with arguments '.json_encode($methodArgs).' at line "'.$node->line.'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | |
148 | 148 | elseif (self::$throw_errors) |
149 | - throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"'); |
|
149 | + throw new \Exception('Calling method to an non-object at line "'.$node->line.'"'); |
|
150 | 150 | break; |
151 | 151 | |
152 | 152 | case STYLES_IMPORTING: |
153 | 153 | foreach ($node->args['imports'] as $style) |
154 | 154 | { |
155 | - $path = eval ('namespace VoidEngine; return '. self::formatLine ($style, self::$objects) .';'); |
|
155 | + $path = eval ('namespace VoidEngine; return '.self::formatLine($style, self::$objects).';'); |
|
156 | 156 | |
157 | - if (!file_exists ($path)) |
|
157 | + if (!file_exists($path)) |
|
158 | 158 | { |
159 | 159 | if (self::$throw_errors) |
160 | - throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"'); |
|
160 | + throw new \Exception('Trying to import nonexistent style at line "'.$node->line.'"'); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | elseif (!isset (self::$imported_styles[$path])) |
164 | 164 | { |
165 | - \VLF\VST\Interpreter::run (\VLF\VST\Parser::parse (file_get_contents ($path))); |
|
165 | + \VLF\VST\Interpreter::run(\VLF\VST\Parser::parse(file_get_contents($path))); |
|
166 | 166 | |
167 | 167 | self::$imported_styles[$path] = true; |
168 | 168 | } |
@@ -170,28 +170,28 @@ discard block |
||
170 | 170 | break; |
171 | 171 | |
172 | 172 | case RUNTIME_EXECUTION: |
173 | - eval (self::formatLine ($node->args['code'], self::$objects)); |
|
173 | + eval (self::formatLine($node->args['code'], self::$objects)); |
|
174 | 174 | break; |
175 | 175 | } |
176 | 176 | |
177 | - $nodes = $node->getNodes (); |
|
177 | + $nodes = $node->getNodes(); |
|
178 | 178 | |
179 | 179 | if ($node->type == OBJECT_DEFINITION) |
180 | 180 | { |
181 | 181 | if (isset (\VLF\VST\Interpreter::$default_styles[$node->args['class']])) |
182 | - $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$default_styles[$node->args['class']]); |
|
182 | + $nodes = array_merge($nodes, \VLF\VST\Interpreter::$default_styles[$node->args['class']]); |
|
183 | 183 | |
184 | 184 | if (isset ($node->args['styles'])) |
185 | 185 | foreach ($node->args['styles'] as $style) |
186 | 186 | if (isset (\VLF\VST\Interpreter::$styles[$style])) |
187 | - $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$styles[$style]); |
|
187 | + $nodes = array_merge($nodes, \VLF\VST\Interpreter::$styles[$style]); |
|
188 | 188 | |
189 | 189 | elseif (self::$throw_errors) |
190 | - throw new \Exception ('Trying to set undefined style "'. $style .'" to object at line "'. $node->line .'"'); |
|
190 | + throw new \Exception('Trying to set undefined style "'.$style.'" to object at line "'.$node->line.'"'); |
|
191 | 191 | } |
192 | 192 | |
193 | - self::$objects = self::run (new AST (array_map ( |
|
194 | - fn ($node) => $node->export (), $nodes)), $node); |
|
193 | + self::$objects = self::run(new AST(array_map( |
|
194 | + fn($node) => $node->export(), $nodes)), $node); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | return self::$objects; |
@@ -205,26 +205,25 @@ discard block |
||
205 | 205 | * |
206 | 206 | * @return string - возвращает форматированную строку |
207 | 207 | */ |
208 | - public static function formatLine (string $line, array $objects = []): string |
|
208 | + public static function formatLine(string $line, array $objects = []): string |
|
209 | 209 | { |
210 | - if (sizeof ($objects) > 0) |
|
210 | + if (sizeof($objects) > 0) |
|
211 | 211 | { |
212 | - $len = strlen ($line); |
|
212 | + $len = strlen($line); |
|
213 | 213 | $newLine = ''; |
214 | 214 | |
215 | - $replacement = array_map (function ($object) |
|
215 | + $replacement = array_map(function($object) |
|
216 | 216 | { |
217 | - return \VoidEngine\Components::exists ($object->selector) !== false ? |
|
218 | - '\VoidEngine\_c('. $object->selector .')' : |
|
219 | - 'unserialize (\''. serialize ($object) .'\')'; |
|
217 | + return \VoidEngine\Components::exists($object->selector) !== false ? |
|
218 | + '\VoidEngine\_c('.$object->selector.')' : 'unserialize (\''.serialize($object).'\')'; |
|
220 | 219 | }, $objects); |
221 | 220 | |
222 | - $replacement = array_map (function ($name) |
|
221 | + $replacement = array_map(function($name) |
|
223 | 222 | { |
224 | - return strlen ($name = trim ($name)) + substr_count ($name, '_'); |
|
225 | - }, $omap = array_flip ($replacement)); |
|
223 | + return strlen($name = trim($name)) + substr_count($name, '_'); |
|
224 | + }, $omap = array_flip($replacement)); |
|
226 | 225 | |
227 | - arsort ($replacement); |
|
226 | + arsort($replacement); |
|
228 | 227 | |
229 | 228 | $nReplacement = []; |
230 | 229 | |
@@ -232,14 +231,14 @@ discard block |
||
232 | 231 | $nReplacement[$omap[$replaceTo]] = $replaceTo; |
233 | 232 | |
234 | 233 | $replacement = $nReplacement; |
235 | - $blacklist = array_flip (['\'', '"', '$']); |
|
234 | + $blacklist = array_flip(['\'', '"', '$']); |
|
236 | 235 | |
237 | 236 | for ($i = 0; $i < $len; ++$i) |
238 | 237 | { |
239 | 238 | $replaced = false; |
240 | 239 | |
241 | 240 | foreach ($replacement as $name => $replaceAt) |
242 | - if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
241 | + if (substr($line, $i, ($l = strlen($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
243 | 242 | { |
244 | 243 | $newLine .= $replaceAt; |
245 | 244 | |
@@ -259,7 +258,7 @@ discard block |
||
259 | 258 | return $line; |
260 | 259 | } |
261 | 260 | |
262 | - public static function clear (): void |
|
261 | + public static function clear(): void |
|
263 | 262 | { |
264 | 263 | self::$objects = []; |
265 | 264 | self::$imported_styles = []; |
@@ -6,62 +6,62 @@ |
||
6 | 6 | { |
7 | 7 | protected static array $objects = []; |
8 | 8 | |
9 | - public static function add (NetObject $object): void |
|
9 | + public static function add(NetObject $object): void |
|
10 | 10 | { |
11 | - self::$objects[$object->selector] = \WeakReference::create ($object); |
|
11 | + self::$objects[$object->selector] = \WeakReference::create($object); |
|
12 | 12 | } |
13 | 13 | |
14 | - public static function get (int $selector): ?NetObject |
|
14 | + public static function get(int $selector): ?NetObject |
|
15 | 15 | { |
16 | 16 | if (!isset (self::$objects[$selector])) |
17 | 17 | return null; |
18 | 18 | |
19 | - $object = self::$objects[$selector]->get (); |
|
19 | + $object = self::$objects[$selector]->get(); |
|
20 | 20 | |
21 | 21 | if ($object === null) |
22 | - self::remove ($selector); |
|
22 | + self::remove($selector); |
|
23 | 23 | |
24 | 24 | return $object; |
25 | 25 | } |
26 | 26 | |
27 | - public static function exists (int $selector): bool |
|
27 | + public static function exists(int $selector): bool |
|
28 | 28 | { |
29 | 29 | return isset (self::$objects[$selector]); |
30 | 30 | } |
31 | 31 | |
32 | - public static function getObjects (): array |
|
32 | + public static function getObjects(): array |
|
33 | 33 | { |
34 | 34 | return self::$objects; |
35 | 35 | } |
36 | 36 | |
37 | - public static function remove (int $selector): void |
|
37 | + public static function remove(int $selector): void |
|
38 | 38 | { |
39 | 39 | unset (self::$objects[$selector]); |
40 | 40 | } |
41 | 41 | |
42 | - public static function clean (): void |
|
42 | + public static function clean(): void |
|
43 | 43 | { |
44 | 44 | foreach (self::$objects as $selector => $reference) |
45 | - if ($reference->get () === null) |
|
45 | + if ($reference->get() === null) |
|
46 | 46 | unset (self::$objects[$selector]); |
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
50 | -function _c (int $selector): ?NetObject |
|
50 | +function _c(int $selector): ?NetObject |
|
51 | 51 | { |
52 | - return Components::get ($selector); |
|
52 | + return Components::get($selector); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | // TODO: поддержка многоуровневых ссылок вида родитель->родитель->объект |
56 | 56 | // VoidCore::getPrevClass |
57 | -function c (string $name): ?NetObject |
|
57 | +function c(string $name): ?NetObject |
|
58 | 58 | { |
59 | - if (is_int ($name) && ($object = _c($name)) !== null) |
|
59 | + if (is_int($name) && ($object = _c($name)) !== null) |
|
60 | 60 | return $object; |
61 | 61 | |
62 | - foreach (Components::getObjects () as $selector => $reference) |
|
62 | + foreach (Components::getObjects() as $selector => $reference) |
|
63 | 63 | { |
64 | - $object = $reference->get (); |
|
64 | + $object = $reference->get(); |
|
65 | 65 | |
66 | 66 | if ($object === null) |
67 | 67 | continue; |
@@ -13,13 +13,15 @@ discard block |
||
13 | 13 | |
14 | 14 | public static function get (int $selector): ?NetObject |
15 | 15 | { |
16 | - if (!isset (self::$objects[$selector])) |
|
17 | - return null; |
|
16 | + if (!isset (self::$objects[$selector])) { |
|
17 | + return null; |
|
18 | + } |
|
18 | 19 | |
19 | 20 | $object = self::$objects[$selector]->get (); |
20 | 21 | |
21 | - if ($object === null) |
|
22 | - self::remove ($selector); |
|
22 | + if ($object === null) { |
|
23 | + self::remove ($selector); |
|
24 | + } |
|
23 | 25 | |
24 | 26 | return $object; |
25 | 27 | } |
@@ -41,9 +43,10 @@ discard block |
||
41 | 43 | |
42 | 44 | public static function clean (): void |
43 | 45 | { |
44 | - foreach (self::$objects as $selector => $reference) |
|
45 | - if ($reference->get () === null) |
|
46 | + foreach (self::$objects as $selector => $reference) { |
|
47 | + if ($reference->get () === null) |
|
46 | 48 | unset (self::$objects[$selector]); |
49 | + } |
|
47 | 50 | } |
48 | 51 | } |
49 | 52 | |
@@ -56,23 +59,24 @@ discard block |
||
56 | 59 | // VoidCore::getPrevClass |
57 | 60 | function c (string $name): ?NetObject |
58 | 61 | { |
59 | - if (is_int ($name) && ($object = _c($name)) !== null) |
|
60 | - return $object; |
|
62 | + if (is_int ($name) && ($object = _c($name)) !== null) { |
|
63 | + return $object; |
|
64 | + } |
|
61 | 65 | |
62 | 66 | foreach (Components::getObjects () as $selector => $reference) |
63 | 67 | { |
64 | 68 | $object = $reference->get (); |
65 | 69 | |
66 | - if ($object === null) |
|
67 | - continue; |
|
70 | + if ($object === null) { |
|
71 | + continue; |
|
72 | + } |
|
68 | 73 | |
69 | 74 | try |
70 | 75 | { |
71 | - if ($object->name == $name) |
|
72 | - return $object; |
|
73 | - } |
|
74 | - |
|
75 | - catch (\Throwable $e) {} |
|
76 | + if ($object->name == $name) { |
|
77 | + return $object; |
|
78 | + } |
|
79 | + } catch (\Throwable $e) {} |
|
76 | 80 | } |
77 | 81 | |
78 | 82 | return null; |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $size = $this->count; |
56 | 56 | $list = []; |
57 | 57 | |
58 | - for ($i = 0; $i < $size; ++$i) |
|
58 | + for ($i = 0; $i < $size; ++$i) |
|
59 | 59 | $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i)); |
60 | 60 | |
61 | 61 | return $list; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | # ArrayAccess |
125 | 125 | |
126 | 126 | public function offsetSet ($index, $value) |
127 | - { |
|
127 | + { |
|
128 | 128 | try |
129 | 129 | { |
130 | 130 | $index === null ? |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
143 | - public function offsetGet ($index) |
|
144 | - { |
|
145 | - return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector); |
|
143 | + public function offsetGet ($index) |
|
144 | + { |
|
145 | + return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector); |
|
146 | 146 | } |
147 | 147 | |
148 | - public function offsetUnset ($index): void |
|
149 | - { |
|
150 | - $this->callMethod ('RemoveAt', $index); |
|
148 | + public function offsetUnset ($index): void |
|
149 | + { |
|
150 | + $this->callMethod ('RemoveAt', $index); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | public function offsetExists ($index): bool |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | |
238 | 238 | class EngineAdditions |
239 | 239 | { |
240 | - /** |
|
240 | + /** |
|
241 | 241 | * * Компиляция PHP кода |
242 | 242 | * |
243 | 243 | * TODO: дополнить описание |
@@ -10,44 +10,44 @@ discard block |
||
10 | 10 | protected ?string $name = null; |
11 | 11 | // protected bool $isCollection = false; |
12 | 12 | |
13 | - public function __construct ($name, $assembly = false, ...$args) |
|
13 | + public function __construct($name, $assembly = false, ...$args) |
|
14 | 14 | { |
15 | 15 | foreach ($args as $id => $arg) |
16 | - $args[$id] = EngineAdditions::uncoupleSelector ($arg); |
|
16 | + $args[$id] = EngineAdditions::uncoupleSelector($arg); |
|
17 | 17 | |
18 | - if (is_int ($name) && VoidCore::objectExists ($name)) |
|
18 | + if (is_int($name) && VoidCore::objectExists($name)) |
|
19 | 19 | $this->selector = $name; |
20 | 20 | |
21 | - elseif (is_string ($name)) |
|
22 | - $this->selector = VoidCore::createObject ($name, $assembly, ...$args); |
|
21 | + elseif (is_string($name)) |
|
22 | + $this->selector = VoidCore::createObject($name, $assembly, ...$args); |
|
23 | 23 | |
24 | - else throw new \Exception ('Incorrect params passed'); |
|
24 | + else throw new \Exception('Incorrect params passed'); |
|
25 | 25 | |
26 | 26 | /*$this->isCollection = $this->getType () |
27 | 27 | ->isSubclassOf (VoidCore::typeof ('System.Collectons.Generic.ICollection'));*/ |
28 | 28 | } |
29 | 29 | |
30 | - public function dispose (): void |
|
30 | + public function dispose(): void |
|
31 | 31 | { |
32 | - VoidCore::removeObjects ($this->selector); |
|
32 | + VoidCore::removeObjects($this->selector); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | # Основные магические методы |
36 | 36 | |
37 | - public function __get (string $name) |
|
37 | + public function __get(string $name) |
|
38 | 38 | { |
39 | - switch (strtolower ($name)) |
|
39 | + switch (strtolower($name)) |
|
40 | 40 | { |
41 | 41 | case 'count': |
42 | 42 | case 'length': |
43 | 43 | try |
44 | 44 | { |
45 | - return $this->getProperty ('Count'); |
|
45 | + return $this->getProperty('Count'); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | catch (\WinformsException $e) |
49 | 49 | { |
50 | - return $this->getProperty ('Length'); |
|
50 | + return $this->getProperty('Length'); |
|
51 | 51 | } |
52 | 52 | break; |
53 | 53 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $list = []; |
57 | 57 | |
58 | 58 | for ($i = 0; $i < $size; ++$i) |
59 | - $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i)); |
|
59 | + $list[] = EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $i)); |
|
60 | 60 | |
61 | 61 | return $list; |
62 | 62 | break; |
@@ -68,93 +68,91 @@ discard block |
||
68 | 68 | for ($i = 0; $i < $size; ++$i) |
69 | 69 | try |
70 | 70 | { |
71 | - $names[] = VoidCore::getProperty (VoidCore::getArrayValue ($this->selector, [$i, VC_OBJECT]), 'Text'); |
|
71 | + $names[] = VoidCore::getProperty(VoidCore::getArrayValue($this->selector, [$i, VC_OBJECT]), 'Text'); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | catch (\WinformsException $e) |
75 | 75 | { |
76 | - $names[] = VoidCore::getArrayValue ($this->selector, [$i, VC_STRING]); |
|
76 | + $names[] = VoidCore::getArrayValue($this->selector, [$i, VC_STRING]); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | return $names; |
80 | 80 | break; |
81 | 81 | } |
82 | 82 | |
83 | - if (method_exists ($this, $method = 'get_'. $name)) |
|
84 | - return $this->$method (); |
|
83 | + if (method_exists($this, $method = 'get_'.$name)) |
|
84 | + return $this->$method(); |
|
85 | 85 | |
86 | 86 | return isset ($this->$name) ? |
87 | - $this->$name : EngineAdditions::coupleSelector ($this->getProperty ($name)); |
|
87 | + $this->$name : EngineAdditions::coupleSelector($this->getProperty($name)); |
|
88 | 88 | } |
89 | 89 | |
90 | - public function __set (string $name, $value): void |
|
90 | + public function __set(string $name, $value): void |
|
91 | 91 | { |
92 | - if (substr ($name, -5) == 'Event') |
|
93 | - Events::setEvent ($this->selector, substr ($name, 0, -5), $value); |
|
92 | + if (substr($name, -5) == 'Event') |
|
93 | + Events::setEvent($this->selector, substr($name, 0, -5), $value); |
|
94 | 94 | |
95 | - elseif (method_exists ($this, $method = 'set_'. $name)) |
|
96 | - $this->$method ($value); |
|
95 | + elseif (method_exists($this, $method = 'set_'.$name)) |
|
96 | + $this->$method($value); |
|
97 | 97 | |
98 | - else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value)); |
|
98 | + else $this->setProperty($name, EngineAdditions::uncoupleSelector($value)); |
|
99 | 99 | } |
100 | 100 | |
101 | - public function __call (string $name, array $args) |
|
101 | + public function __call(string $name, array $args) |
|
102 | 102 | { |
103 | - return EngineAdditions::coupleSelector ($this->callMethod ($name, |
|
104 | - array_map ('VoidEngine\\EngineAdditions::uncoupleSelector', $args))); |
|
103 | + return EngineAdditions::coupleSelector($this->callMethod($name, |
|
104 | + array_map('VoidEngine\\EngineAdditions::uncoupleSelector', $args))); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | # Управление VoidCore |
108 | 108 | |
109 | - protected function getProperty ($name) |
|
109 | + protected function getProperty($name) |
|
110 | 110 | { |
111 | - return VoidCore::getProperty ($this->selector, $name); |
|
111 | + return VoidCore::getProperty($this->selector, $name); |
|
112 | 112 | } |
113 | 113 | |
114 | - protected function setProperty (string $name, $value): void |
|
114 | + protected function setProperty(string $name, $value): void |
|
115 | 115 | { |
116 | - VoidCore::setProperty ($this->selector, $name, $value); |
|
116 | + VoidCore::setProperty($this->selector, $name, $value); |
|
117 | 117 | } |
118 | 118 | |
119 | - protected function callMethod (string $name, array $args = []) |
|
119 | + protected function callMethod(string $name, array $args = []) |
|
120 | 120 | { |
121 | - return VoidCore::callMethod ($this->selector, $name, ...$args); |
|
121 | + return VoidCore::callMethod($this->selector, $name, ...$args); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | # ArrayAccess |
125 | 125 | |
126 | - public function offsetSet ($index, $value) |
|
126 | + public function offsetSet($index, $value) |
|
127 | 127 | { |
128 | 128 | try |
129 | 129 | { |
130 | 130 | $index === null ? |
131 | - $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) : |
|
132 | - $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value)); |
|
131 | + $this->callMethod('Add', EngineAdditions::uncoupleSelector($value)) : $this->callMethod('Insert', $index, EngineAdditions::uncoupleSelector($value)); |
|
133 | 132 | } |
134 | 133 | |
135 | 134 | catch (\Throwable $e) |
136 | 135 | { |
137 | 136 | $index === null ? |
138 | - VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) : |
|
139 | - VoidCore::setArrayValue ($this->selector, $index, EngineAdditions::uncoupleSelector ($value)); |
|
137 | + VoidCore::setArrayValue($this->selector, $this->count, EngineAdditions::uncoupleSelector($value)) : VoidCore::setArrayValue($this->selector, $index, EngineAdditions::uncoupleSelector($value)); |
|
140 | 138 | } |
141 | 139 | } |
142 | 140 | |
143 | - public function offsetGet ($index) |
|
141 | + public function offsetGet($index) |
|
144 | 142 | { |
145 | - return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector); |
|
143 | + return EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $index), $this->selector); |
|
146 | 144 | } |
147 | 145 | |
148 | - public function offsetUnset ($index): void |
|
146 | + public function offsetUnset($index): void |
|
149 | 147 | { |
150 | - $this->callMethod ('RemoveAt', $index); |
|
148 | + $this->callMethod('RemoveAt', $index); |
|
151 | 149 | } |
152 | 150 | |
153 | - public function offsetExists ($index): bool |
|
151 | + public function offsetExists($index): bool |
|
154 | 152 | { |
155 | 153 | try |
156 | 154 | { |
157 | - $this->offsetGet ($index); |
|
155 | + $this->offsetGet($index); |
|
158 | 156 | } |
159 | 157 | |
160 | 158 | catch (\WinformsException $e) |
@@ -172,16 +170,16 @@ discard block |
||
172 | 170 | $size = $this->count; |
173 | 171 | |
174 | 172 | for ($i = 0; $i < $size; ++$i) |
175 | - $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i); |
|
173 | + $callback(EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i); |
|
176 | 174 | } |
177 | 175 | |
178 | - public function where (callable $comparator, string $type = null): array |
|
176 | + public function where(callable $comparator, string $type = null): array |
|
179 | 177 | { |
180 | 178 | $size = $this->count; |
181 | 179 | $return = []; |
182 | 180 | |
183 | 181 | for ($i = 0; $i < $size; ++$i) |
184 | - if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i)) |
|
182 | + if ($comparator($value = EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i)) |
|
185 | 183 | $return[] = $value; |
186 | 184 | |
187 | 185 | return $return; |
@@ -189,30 +187,30 @@ discard block |
||
189 | 187 | |
190 | 188 | # Магические методы |
191 | 189 | |
192 | - public function __destruct () |
|
190 | + public function __destruct() |
|
193 | 191 | { |
194 | - VoidCore::destructObject ($this->selector); |
|
192 | + VoidCore::destructObject($this->selector); |
|
195 | 193 | } |
196 | 194 | |
197 | - public function __toString (): string |
|
195 | + public function __toString(): string |
|
198 | 196 | { |
199 | 197 | return $this->selector; |
200 | 198 | } |
201 | 199 | |
202 | - public function __debugInfo (): array |
|
200 | + public function __debugInfo(): array |
|
203 | 201 | { |
204 | 202 | $info = ['selector' => $this->selector]; |
205 | 203 | |
206 | 204 | try |
207 | 205 | { |
208 | - $info['name'] = $this->getProperty ('Name'); |
|
206 | + $info['name'] = $this->getProperty('Name'); |
|
209 | 207 | } |
210 | 208 | |
211 | 209 | catch (\WinformsException $e) {} |
212 | 210 | |
213 | 211 | try |
214 | 212 | { |
215 | - $info['info'] = $this->callMethod ('ToString'); |
|
213 | + $info['info'] = $this->callMethod('ToString'); |
|
216 | 214 | } |
217 | 215 | |
218 | 216 | catch (\WinformsException $e) {} |
@@ -223,15 +221,15 @@ discard block |
||
223 | 221 | |
224 | 222 | class NetClass extends NetObject |
225 | 223 | { |
226 | - public function __construct ($name, $assembly = false) |
|
224 | + public function __construct($name, $assembly = false) |
|
227 | 225 | { |
228 | - if (is_int ($name) && VoidCore::objectExists ($name)) |
|
226 | + if (is_int($name) && VoidCore::objectExists($name)) |
|
229 | 227 | $this->selector = $name; |
230 | 228 | |
231 | - elseif (is_string ($name)) |
|
232 | - $this->selector = VoidCore::getClass ($name, $assembly); |
|
229 | + elseif (is_string($name)) |
|
230 | + $this->selector = VoidCore::getClass($name, $assembly); |
|
233 | 231 | |
234 | - else throw new \Exception ('Incorrect params passed'); |
|
232 | + else throw new \Exception('Incorrect params passed'); |
|
235 | 233 | } |
236 | 234 | } |
237 | 235 | |
@@ -256,16 +254,16 @@ discard block |
||
256 | 254 | * |
257 | 255 | * @return array - возвращает список ошибок компиляции |
258 | 256 | */ |
259 | - public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', NetObject $dictionary = null, NetObject $assemblies = null): array |
|
257 | + public static function compile(string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', NetObject $dictionary = null, NetObject $assemblies = null): array |
|
260 | 258 | { |
261 | 259 | if ($dictionary === null) |
262 | - $dictionary = new NetObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null); |
|
260 | + $dictionary = new NetObject('System.Collections.Generic.Dictionary`2[System.String,System.String]', null); |
|
263 | 261 | |
264 | 262 | if ($assemblies === null) |
265 | - $assemblies = dnArray ('System.String', []); |
|
263 | + $assemblies = dnArray('System.String', []); |
|
266 | 264 | |
267 | 265 | if ($productName === null) |
268 | - $productName = basenameNoExt ($savePath); |
|
266 | + $productName = basenameNoExt($savePath); |
|
269 | 267 | |
270 | 268 | if ($productDescription === null) |
271 | 269 | $productDescription = $productName; |
@@ -277,16 +275,16 @@ discard block |
||
277 | 275 | $companyName = 'Company N'; |
278 | 276 | |
279 | 277 | if ($copyright === null) |
280 | - $copyright = $companyName .' copyright (c) '. date ('Y'); |
|
278 | + $copyright = $companyName.' copyright (c) '.date('Y'); |
|
281 | 279 | |
282 | - return (new NetClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names; |
|
280 | + return (new NetClass('WinForms_PHP.WFCompiler', null))->compile($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names; |
|
283 | 281 | } |
284 | 282 | |
285 | - public static function loadModule (string $path): bool |
|
283 | + public static function loadModule(string $path): bool |
|
286 | 284 | { |
287 | 285 | try |
288 | 286 | { |
289 | - (new NetClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path); |
|
287 | + (new NetClass('System.Reflection.Assembly', 'mscorlib'))->loadFrom($path); |
|
290 | 288 | } |
291 | 289 | |
292 | 290 | catch (\WinformsException $e) |
@@ -297,15 +295,15 @@ discard block |
||
297 | 295 | return true; |
298 | 296 | } |
299 | 297 | |
300 | - public static function coupleSelector ($selector) |
|
298 | + public static function coupleSelector($selector) |
|
301 | 299 | { |
302 | - return is_int ($selector) && VoidCore::objectExists ($selector) ? |
|
303 | - new NetObject ($selector) : $selector; |
|
300 | + return is_int($selector) && VoidCore::objectExists($selector) ? |
|
301 | + new NetObject($selector) : $selector; |
|
304 | 302 | } |
305 | 303 | |
306 | - public static function uncoupleSelector ($object) |
|
304 | + public static function uncoupleSelector($object) |
|
307 | 305 | { |
308 | - return is_object ($object) && $object instanceof NetObject ? |
|
306 | + return is_object($object) && $object instanceof NetObject ? |
|
309 | 307 | $object->selector : $object; |
310 | 308 | } |
311 | 309 | } |
@@ -12,16 +12,17 @@ discard block |
||
12 | 12 | |
13 | 13 | public function __construct ($name, $assembly = false, ...$args) |
14 | 14 | { |
15 | - foreach ($args as $id => $arg) |
|
16 | - $args[$id] = EngineAdditions::uncoupleSelector ($arg); |
|
15 | + foreach ($args as $id => $arg) { |
|
16 | + $args[$id] = EngineAdditions::uncoupleSelector ($arg); |
|
17 | + } |
|
17 | 18 | |
18 | - if (is_int ($name) && VoidCore::objectExists ($name)) |
|
19 | - $this->selector = $name; |
|
20 | - |
|
21 | - elseif (is_string ($name)) |
|
22 | - $this->selector = VoidCore::createObject ($name, $assembly, ...$args); |
|
23 | - |
|
24 | - else throw new \Exception ('Incorrect params passed'); |
|
19 | + if (is_int ($name) && VoidCore::objectExists ($name)) { |
|
20 | + $this->selector = $name; |
|
21 | + } elseif (is_string ($name)) { |
|
22 | + $this->selector = VoidCore::createObject ($name, $assembly, ...$args); |
|
23 | + } else { |
|
24 | + throw new \Exception ('Incorrect params passed'); |
|
25 | + } |
|
25 | 26 | |
26 | 27 | /*$this->isCollection = $this->getType () |
27 | 28 | ->isSubclassOf (VoidCore::typeof ('System.Collectons.Generic.ICollection'));*/ |
@@ -43,9 +44,7 @@ discard block |
||
43 | 44 | try |
44 | 45 | { |
45 | 46 | return $this->getProperty ('Count'); |
46 | - } |
|
47 | - |
|
48 | - catch (\WinformsException $e) |
|
47 | + } catch (\WinformsException $e) |
|
49 | 48 | { |
50 | 49 | return $this->getProperty ('Length'); |
51 | 50 | } |
@@ -55,8 +54,9 @@ discard block |
||
55 | 54 | $size = $this->count; |
56 | 55 | $list = []; |
57 | 56 | |
58 | - for ($i = 0; $i < $size; ++$i) |
|
59 | - $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i)); |
|
57 | + for ($i = 0; $i < $size; ++$i) { |
|
58 | + $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i)); |
|
59 | + } |
|
60 | 60 | |
61 | 61 | return $list; |
62 | 62 | break; |
@@ -65,13 +65,12 @@ discard block |
||
65 | 65 | $size = $this->count; |
66 | 66 | $names = []; |
67 | 67 | |
68 | - for ($i = 0; $i < $size; ++$i) |
|
69 | - try |
|
68 | + for ($i = 0; $i < $size; ++$i) { |
|
69 | + try |
|
70 | 70 | { |
71 | 71 | $names[] = VoidCore::getProperty (VoidCore::getArrayValue ($this->selector, [$i, VC_OBJECT]), 'Text'); |
72 | - } |
|
73 | - |
|
74 | - catch (\WinformsException $e) |
|
72 | + } |
|
73 | + } catch (\WinformsException $e) |
|
75 | 74 | { |
76 | 75 | $names[] = VoidCore::getArrayValue ($this->selector, [$i, VC_STRING]); |
77 | 76 | } |
@@ -80,8 +79,9 @@ discard block |
||
80 | 79 | break; |
81 | 80 | } |
82 | 81 | |
83 | - if (method_exists ($this, $method = 'get_'. $name)) |
|
84 | - return $this->$method (); |
|
82 | + if (method_exists ($this, $method = 'get_'. $name)) { |
|
83 | + return $this->$method (); |
|
84 | + } |
|
85 | 85 | |
86 | 86 | return isset ($this->$name) ? |
87 | 87 | $this->$name : EngineAdditions::coupleSelector ($this->getProperty ($name)); |
@@ -89,13 +89,13 @@ discard block |
||
89 | 89 | |
90 | 90 | public function __set (string $name, $value): void |
91 | 91 | { |
92 | - if (substr ($name, -5) == 'Event') |
|
93 | - Events::setEvent ($this->selector, substr ($name, 0, -5), $value); |
|
94 | - |
|
95 | - elseif (method_exists ($this, $method = 'set_'. $name)) |
|
96 | - $this->$method ($value); |
|
97 | - |
|
98 | - else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value)); |
|
92 | + if (substr ($name, -5) == 'Event') { |
|
93 | + Events::setEvent ($this->selector, substr ($name, 0, -5), $value); |
|
94 | + } elseif (method_exists ($this, $method = 'set_'. $name)) { |
|
95 | + $this->$method ($value); |
|
96 | + } else { |
|
97 | + $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value)); |
|
98 | + } |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | public function __call (string $name, array $args) |
@@ -130,9 +130,7 @@ discard block |
||
130 | 130 | $index === null ? |
131 | 131 | $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) : |
132 | 132 | $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value)); |
133 | - } |
|
134 | - |
|
135 | - catch (\Throwable $e) |
|
133 | + } catch (\Throwable $e) |
|
136 | 134 | { |
137 | 135 | $index === null ? |
138 | 136 | VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) : |
@@ -155,9 +153,7 @@ discard block |
||
155 | 153 | try |
156 | 154 | { |
157 | 155 | $this->offsetGet ($index); |
158 | - } |
|
159 | - |
|
160 | - catch (\WinformsException $e) |
|
156 | + } catch (\WinformsException $e) |
|
161 | 157 | { |
162 | 158 | return false; |
163 | 159 | } |
@@ -171,8 +167,9 @@ discard block |
||
171 | 167 | { |
172 | 168 | $size = $this->count; |
173 | 169 | |
174 | - for ($i = 0; $i < $size; ++$i) |
|
175 | - $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i); |
|
170 | + for ($i = 0; $i < $size; ++$i) { |
|
171 | + $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i); |
|
172 | + } |
|
176 | 173 | } |
177 | 174 | |
178 | 175 | public function where (callable $comparator, string $type = null): array |
@@ -180,9 +177,10 @@ discard block |
||
180 | 177 | $size = $this->count; |
181 | 178 | $return = []; |
182 | 179 | |
183 | - for ($i = 0; $i < $size; ++$i) |
|
184 | - if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i)) |
|
180 | + for ($i = 0; $i < $size; ++$i) { |
|
181 | + if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i)) |
|
185 | 182 | $return[] = $value; |
183 | + } |
|
186 | 184 | |
187 | 185 | return $return; |
188 | 186 | } |
@@ -206,16 +204,12 @@ discard block |
||
206 | 204 | try |
207 | 205 | { |
208 | 206 | $info['name'] = $this->getProperty ('Name'); |
209 | - } |
|
210 | - |
|
211 | - catch (\WinformsException $e) {} |
|
207 | + } catch (\WinformsException $e) {} |
|
212 | 208 | |
213 | 209 | try |
214 | 210 | { |
215 | 211 | $info['info'] = $this->callMethod ('ToString'); |
216 | - } |
|
217 | - |
|
218 | - catch (\WinformsException $e) {} |
|
212 | + } catch (\WinformsException $e) {} |
|
219 | 213 | |
220 | 214 | return $info; |
221 | 215 | } |
@@ -225,13 +219,13 @@ discard block |
||
225 | 219 | { |
226 | 220 | public function __construct ($name, $assembly = false) |
227 | 221 | { |
228 | - if (is_int ($name) && VoidCore::objectExists ($name)) |
|
229 | - $this->selector = $name; |
|
230 | - |
|
231 | - elseif (is_string ($name)) |
|
232 | - $this->selector = VoidCore::getClass ($name, $assembly); |
|
233 | - |
|
234 | - else throw new \Exception ('Incorrect params passed'); |
|
222 | + if (is_int ($name) && VoidCore::objectExists ($name)) { |
|
223 | + $this->selector = $name; |
|
224 | + } elseif (is_string ($name)) { |
|
225 | + $this->selector = VoidCore::getClass ($name, $assembly); |
|
226 | + } else { |
|
227 | + throw new \Exception ('Incorrect params passed'); |
|
228 | + } |
|
235 | 229 | } |
236 | 230 | } |
237 | 231 | |
@@ -258,26 +252,33 @@ discard block |
||
258 | 252 | */ |
259 | 253 | public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', NetObject $dictionary = null, NetObject $assemblies = null): array |
260 | 254 | { |
261 | - if ($dictionary === null) |
|
262 | - $dictionary = new NetObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null); |
|
255 | + if ($dictionary === null) { |
|
256 | + $dictionary = new NetObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null); |
|
257 | + } |
|
263 | 258 | |
264 | - if ($assemblies === null) |
|
265 | - $assemblies = dnArray ('System.String', []); |
|
259 | + if ($assemblies === null) { |
|
260 | + $assemblies = dnArray ('System.String', []); |
|
261 | + } |
|
266 | 262 | |
267 | - if ($productName === null) |
|
268 | - $productName = basenameNoExt ($savePath); |
|
263 | + if ($productName === null) { |
|
264 | + $productName = basenameNoExt ($savePath); |
|
265 | + } |
|
269 | 266 | |
270 | - if ($productDescription === null) |
|
271 | - $productDescription = $productName; |
|
267 | + if ($productDescription === null) { |
|
268 | + $productDescription = $productName; |
|
269 | + } |
|
272 | 270 | |
273 | - if ($productVersion === null) |
|
274 | - $productVersion = '1.0'; |
|
271 | + if ($productVersion === null) { |
|
272 | + $productVersion = '1.0'; |
|
273 | + } |
|
275 | 274 | |
276 | - if ($companyName === null) |
|
277 | - $companyName = 'Company N'; |
|
275 | + if ($companyName === null) { |
|
276 | + $companyName = 'Company N'; |
|
277 | + } |
|
278 | 278 | |
279 | - if ($copyright === null) |
|
280 | - $copyright = $companyName .' copyright (c) '. date ('Y'); |
|
279 | + if ($copyright === null) { |
|
280 | + $copyright = $companyName .' copyright (c) '. date ('Y'); |
|
281 | + } |
|
281 | 282 | |
282 | 283 | return (new NetClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names; |
283 | 284 | } |
@@ -287,9 +288,7 @@ discard block |
||
287 | 288 | try |
288 | 289 | { |
289 | 290 | (new NetClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path); |
290 | - } |
|
291 | - |
|
292 | - catch (\WinformsException $e) |
|
291 | + } catch (\WinformsException $e) |
|
293 | 292 | { |
294 | 293 | return false; |
295 | 294 | } |
@@ -11,12 +11,12 @@ |
||
11 | 11 | const APP_DIR = __DIR__; |
12 | 12 | |
13 | 13 | define ('VoidEngine\CORE_DIR', |
14 | - file_exists ($dir = dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __DIR__); |
|
14 | + file_exists ($dir = dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __DIR__); |
|
15 | 15 | |
16 | 16 | # Подгружаем PHP расширения |
17 | 17 | foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) |
18 | - if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
19 | - load_extension ($ext); |
|
18 | + if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
19 | + load_extension ($ext); |
|
20 | 20 | |
21 | 21 | # Подгружаем Qero-пакеты |
22 | 22 | require __DIR__ .'/../qero-packages/autoload.php'; |
@@ -10,20 +10,20 @@ |
||
10 | 10 | # Объявление констант |
11 | 11 | const APP_DIR = __DIR__; |
12 | 12 | |
13 | -define ('VoidEngine\CORE_DIR', |
|
14 | - file_exists ($dir = dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __DIR__); |
|
13 | +define('VoidEngine\CORE_DIR', |
|
14 | + file_exists($dir = dirname(__DIR__).'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __DIR__); |
|
15 | 15 | |
16 | 16 | # Подгружаем PHP расширения |
17 | -foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) |
|
18 | - if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
19 | - load_extension ($ext); |
|
17 | +foreach (glob(CORE_DIR.'/ext/php_*.dll') as $ext) |
|
18 | + if (!extension_loaded(substr(basename($ext), 4, -4))) |
|
19 | + load_extension($ext); |
|
20 | 20 | |
21 | 21 | # Подгружаем Qero-пакеты |
22 | -require __DIR__ .'/../qero-packages/autoload.php'; |
|
22 | +require __DIR__.'/../qero-packages/autoload.php'; |
|
23 | 23 | |
24 | -chdir (APP_DIR); // Меняем стандартную директорию на директорию приложения |
|
24 | +chdir(APP_DIR); // Меняем стандартную директорию на директорию приложения |
|
25 | 25 | |
26 | 26 | # Парсим разметку app.vlf и запускаем приложение |
27 | -$objects = Interpreter::run (Parser::parse ('app.vlf')); |
|
27 | +$objects = Interpreter::run(Parser::parse('app.vlf')); |
|
28 | 28 | |
29 | -$APPLICATION->run ($objects['MainForm']); |
|
29 | +$APPLICATION->run($objects['MainForm']); |
@@ -14,9 +14,10 @@ |
||
14 | 14 | file_exists ($dir = dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __DIR__); |
15 | 15 | |
16 | 16 | # Подгружаем PHP расширения |
17 | -foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) |
|
17 | +foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) { |
|
18 | 18 | if (!extension_loaded (substr (basename ($ext), 4, -4))) |
19 | 19 | load_extension ($ext); |
20 | +} |
|
20 | 21 | |
21 | 22 | # Подгружаем Qero-пакеты |
22 | 23 | require __DIR__ .'/../qero-packages/autoload.php'; |