@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | class VLFImporter |
| 6 | 6 | { |
| 7 | - static function import (string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array ( |
|
| 7 | + static function import(string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array( |
|
| 8 | 8 | 'strong_line_parser' => false, |
| 9 | 9 | 'ignore_postobject_info' => true, |
| 10 | 10 | 'ignore_unexpected_method_args' => true, |
@@ -13,20 +13,20 @@ discard block |
||
| 13 | 13 | 'debug_mode' => false |
| 14 | 14 | )): array |
| 15 | 15 | { |
| 16 | - $objects = VLFInterpreter::run (new VLFParser ($vlf, $settings)); |
|
| 16 | + $objects = VLFInterpreter::run(new VLFParser($vlf, $settings)); |
|
| 17 | 17 | $designers = []; |
| 18 | 18 | |
| 19 | 19 | foreach ($objects as $name => $object) |
| 20 | 20 | if ($object instanceof Form) |
| 21 | 21 | { |
| 22 | - $page = new TabPage ($name); |
|
| 23 | - $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
|
| 22 | + $page = new TabPage($name); |
|
| 23 | + $designers[$object->selector] = new VoidDesigner($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
|
| 24 | 24 | |
| 25 | 25 | $designers[$object->selector]->form->text = $object->text; |
| 26 | 26 | |
| 27 | - VoidStudioAPI::addObjects ('main', ['Designer__'. $name .'Designer' => $designers[$object->selector]]); |
|
| 27 | + VoidStudioAPI::addObjects('main', ['Designer__'.$name.'Designer' => $designers[$object->selector]]); |
|
| 28 | 28 | |
| 29 | - $formsList->items->add ($page); |
|
| 29 | + $formsList->items->add($page); |
|
| 30 | 30 | $formsList->selectedTab = $page->selector; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $parent = $parent->parent; |
| 39 | 39 | |
| 40 | 40 | if (isset ($designers[$parent->selector])) |
| 41 | - $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 41 | + $designers[$parent->selector]->addComponent($object->selector, $name); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | catch (\Throwable $e) {} |
@@ -16,10 +16,11 @@ discard block |
||
| 16 | 16 | $objects = VLFInterpreter::run (new VLFParser ($vlf, $settings)); |
| 17 | 17 | $designers = []; |
| 18 | 18 | |
| 19 | - foreach ($objects as $name => $object) |
|
| 20 | - if ($object instanceof Form) |
|
| 19 | + foreach ($objects as $name => $object) { |
|
| 20 | + if ($object instanceof Form) |
|
| 21 | 21 | { |
| 22 | 22 | $page = new TabPage ($name); |
| 23 | + } |
|
| 23 | 24 | $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
| 24 | 25 | |
| 25 | 26 | $designers[$object->selector]->form->text = $object->text; |
@@ -28,20 +29,19 @@ discard block |
||
| 28 | 29 | |
| 29 | 30 | $formsList->items->add ($page); |
| 30 | 31 | $formsList->selectedTab = $page->selector; |
| 31 | - } |
|
| 32 | - |
|
| 33 | - elseif ($object instanceof Control) |
|
| 34 | - try |
|
| 32 | + } elseif ($object instanceof Control) { |
|
| 33 | + try |
|
| 35 | 34 | { |
| 36 | 35 | $parent = $object->parent; |
| 37 | - while (!isset ($designers[$parent->selector]) && $parent->parent) |
|
| 38 | - $parent = $parent->parent; |
|
| 39 | - |
|
| 40 | - if (isset ($designers[$parent->selector])) |
|
| 41 | - $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - catch (\Throwable $e) {} |
|
| 36 | + } |
|
| 37 | + while (!isset ($designers[$parent->selector]) && $parent->parent) { |
|
| 38 | + $parent = $parent->parent; |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + if (isset ($designers[$parent->selector])) { |
|
| 42 | + $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 43 | + } |
|
| 44 | + } catch (\Throwable $e) {} |
|
| 45 | 45 | |
| 46 | 46 | return $designers; |
| 47 | 47 | } |
@@ -20,13 +20,13 @@ discard block |
||
| 20 | 20 | * @return array - возвращает список созданных объектов |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | - public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array |
|
| 23 | + public static function run($syntaxTree, string $resourcesDir = null, array $parent = null): array |
|
| 24 | 24 | { |
| 25 | 25 | if ($syntaxTree instanceof VLFParser) |
| 26 | 26 | $syntaxTree = $syntaxTree->tree; |
| 27 | 27 | |
| 28 | - elseif (!is_array ($syntaxTree) && self::$throw_errors) |
|
| 29 | - throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 28 | + elseif (!is_array($syntaxTree) && self::$throw_errors) |
|
| 29 | + throw new \Exception('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 30 | 30 | |
| 31 | 31 | foreach ($syntaxTree as $id => $syntaxInfo) |
| 32 | 32 | if (isset ($syntaxInfo['type'])) |
@@ -43,16 +43,16 @@ discard block |
||
| 43 | 43 | $args = $syntaxInfo['info']['arguments']; |
| 44 | 44 | |
| 45 | 45 | foreach ($args as $arg_id => $arg) |
| 46 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 46 | + if (is_object($arg) && $arg instanceof VLFLink) |
|
| 47 | 47 | $args[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 48 | - self::formatLine ($arg->name, self::$objects) : null; |
|
| 48 | + self::formatLine($arg->name, self::$objects) : null; |
|
| 49 | 49 | |
| 50 | - else $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 50 | + else $args[$arg_id] = self::formatLine($arg, self::$objects); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | try |
| 54 | 54 | { |
| 55 | - self::$objects[$name] = eval ("namespace VoidEngine; return new $class (". implode (', ', $args) .");"); |
|
| 55 | + self::$objects[$name] = eval ("namespace VoidEngine; return new $class (".implode(', ', $args).");"); |
|
| 56 | 56 | |
| 57 | 57 | try |
| 58 | 58 | { |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | catch (\Throwable $e) |
| 66 | 66 | { |
| 67 | 67 | if (self::$throw_errors) |
| 68 | - throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 68 | + throw new \Exception('Interpeter couldn\'t create object "'.$class.'" with name "'.$name.'" at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
| 69 | 69 | } |
| 70 | 70 | break; |
| 71 | 71 | |
| 72 | 72 | case VLF_SUBOBJECT_DEFINITION: |
| 73 | - self::$objects = self::run ((new VLFParser ($syntaxInfo['info']['object_vlf_info']))->tree, null, $syntaxInfo); |
|
| 73 | + self::$objects = self::run((new VLFParser($syntaxInfo['info']['object_vlf_info']))->tree, null, $syntaxInfo); |
|
| 74 | 74 | break; |
| 75 | 75 | |
| 76 | 76 | case VLF_PROPERTY_SET: |
@@ -80,34 +80,34 @@ discard block |
||
| 80 | 80 | $propertyValue = $syntaxInfo['info']['property_value']; |
| 81 | 81 | $preset = ''; |
| 82 | 82 | |
| 83 | - if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) |
|
| 83 | + if (is_object($propertyValue) && $propertyValue instanceof VLFLink) |
|
| 84 | 84 | $propertyValue = isset (self::$objects[$propertyValue->name]) ? |
| 85 | - self::formatLine ($propertyValue->name, self::$objects) : null; |
|
| 85 | + self::formatLine($propertyValue->name, self::$objects) : null; |
|
| 86 | 86 | |
| 87 | - elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 87 | + elseif (preg_match('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 88 | 88 | { |
| 89 | - $use = substr ($propertyValue, strpos ($propertyValue, 'use')); |
|
| 90 | - $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos); |
|
| 91 | - $use = explode (' ', $use); |
|
| 89 | + $use = substr($propertyValue, strpos($propertyValue, 'use')); |
|
| 90 | + $use = $ouse = substr($use, ($pos = strpos($use, '(') + 1), strpos($use, ')') - $pos); |
|
| 91 | + $use = explode(' ', $use); |
|
| 92 | 92 | |
| 93 | 93 | foreach ($use as $id => $useParam) |
| 94 | 94 | if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
| 95 | 95 | { |
| 96 | 96 | $fname = $use[$id + 1]; |
| 97 | 97 | |
| 98 | - if (substr ($fname, strlen ($fname) - 1) == ',') |
|
| 99 | - $fname = substr ($fname, 0, -1); |
|
| 98 | + if (substr($fname, strlen($fname) - 1) == ',') |
|
| 99 | + $fname = substr($fname, 0, -1); |
|
| 100 | 100 | |
| 101 | 101 | $preset .= "$fname = $useParam; "; |
| 102 | 102 | |
| 103 | 103 | unset ($use[$id]); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - $preset = self::formatLine ($preset, self::$objects); |
|
| 107 | - $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $use), $propertyValue), self::$objects); |
|
| 106 | + $preset = self::formatLine($preset, self::$objects); |
|
| 107 | + $propertyValue = self::formatLine(str_replace($ouse, join(' ', $use), $propertyValue), self::$objects); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - else $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
| 110 | + else $propertyValue = self::formatLine($propertyValue, self::$objects); |
|
| 111 | 111 | |
| 112 | 112 | try |
| 113 | 113 | { |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | { |
| 121 | 121 | $propertyValue = $syntaxInfo['info']['property_raw_value']; |
| 122 | 122 | |
| 123 | - if (strpos ($propertyName, '->') !== false) |
|
| 124 | - eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
| 123 | + if (strpos($propertyName, '->') !== false) |
|
| 124 | + eval ('namespace VoidEngine; '.$preset.' _c('.self::$objects[$name]->selector.')->'.$propertyName.' = '.$propertyValue.';'); |
|
| 125 | 125 | |
| 126 | 126 | else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
| 127 | 127 | } |
@@ -129,13 +129,13 @@ discard block |
||
| 129 | 129 | catch (\Throwable $e) |
| 130 | 130 | { |
| 131 | 131 | if (self::$throw_errors) |
| 132 | - throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 132 | + throw new \Exception('Interpeter couldn\'t set property "'.$propertyName.'" with value "'.$propertyValue.'" at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | elseif (self::$throw_errors) |
| 138 | - throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']); |
|
| 138 | + throw new \Exception('Setting property to an non-object at line "'.$syntaxInfo['line']); |
|
| 139 | 139 | break; |
| 140 | 140 | |
| 141 | 141 | case VLF_METHOD_CALL: |
@@ -145,58 +145,58 @@ discard block |
||
| 145 | 145 | $methodArgs = $syntaxInfo['info']['method_arguments']; |
| 146 | 146 | |
| 147 | 147 | foreach ($methodArgs as $arg_id => $arg) |
| 148 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 148 | + if (is_object($arg) && $arg instanceof VLFLink) |
|
| 149 | 149 | $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 150 | - self::formatLine ($arg->name, self::$objects) : null; |
|
| 150 | + self::formatLine($arg->name, self::$objects) : null; |
|
| 151 | 151 | |
| 152 | - else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 152 | + else $methodArgs[$arg_id] = self::formatLine($arg, self::$objects); |
|
| 153 | 153 | |
| 154 | 154 | try |
| 155 | 155 | { |
| 156 | - if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
| 157 | - eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
| 156 | + if (strpos($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
| 157 | + eval ('namespace VoidEngine; _c('.self::$objects[$name]->selector.')->'.$methodName.' ('.implode(', ', $methodArgs).');'); |
|
| 158 | 158 | |
| 159 | - else self::$objects[$name]->$methodName (...$methodArgs); |
|
| 159 | + else self::$objects[$name]->$methodName(...$methodArgs); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | catch (\Throwable $e) |
| 163 | 163 | { |
| 164 | 164 | if (self::$throw_errors) |
| 165 | - throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 165 | + throw new \Exception('Interpeter couldn\'t call method "'.$methodName.'" with arguments '.json_encode($methodArgs).' at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | elseif (self::$throw_errors) |
| 170 | - throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"'); |
|
| 170 | + throw new \Exception('Calling method to an non-object at line "'.$syntaxInfo['line'].'"'); |
|
| 171 | 171 | break; |
| 172 | 172 | |
| 173 | 173 | case VLF_RUNTIME_EXECUTABLE: |
| 174 | - eval (self::formatLine ($syntaxInfo['info']['code'], self::$objects)); |
|
| 174 | + eval (self::formatLine($syntaxInfo['info']['code'], self::$objects)); |
|
| 175 | 175 | break; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) |
|
| 179 | - self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 178 | + if (isset ($syntaxInfo['syntax_nodes']) && sizeof($syntaxInfo['syntax_nodes']) > 0) |
|
| 179 | + self::$objects = self::run($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"'); |
|
| 182 | + else throw new \Exception('Catched unknown syntax node: "'.json_encode($syntaxInfo).'"'); |
|
| 183 | 183 | |
| 184 | - if (is_dir ($resourcesDir)) |
|
| 185 | - foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir) |
|
| 184 | + if (is_dir($resourcesDir)) |
|
| 185 | + foreach (glob($resourcesDir.'/*.vrsf') as $id => $dir) |
|
| 186 | 186 | { |
| 187 | - $baseName = basenameNoExt ($dir); |
|
| 188 | - $info = explode ('.', $baseName); |
|
| 187 | + $baseName = basenameNoExt($dir); |
|
| 188 | + $info = explode('.', $baseName); |
|
| 189 | 189 | |
| 190 | 190 | if (isset (self::$objects[$info[0]])) |
| 191 | 191 | { |
| 192 | 192 | if (isset ($info[2])) |
| 193 | 193 | { |
| 194 | - $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]); |
|
| 194 | + $collection = VoidEngine::getProperty(self::$objects[$info[0]]->selector, $info[1]); |
|
| 195 | 195 | |
| 196 | - VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']); |
|
| 196 | + VoidEngine::callMethod($collection, 'Add', [VoidEngine::importObject(base64_encode(file_get_contents($dir))), 'object']); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir)))); |
|
| 199 | + else VoidEngine::setProperty(self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject(base64_encode(file_get_contents($dir)))); |
|
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | |
@@ -213,26 +213,25 @@ discard block |
||
| 213 | 213 | * @return string - возвращает форматированную строку |
| 214 | 214 | */ |
| 215 | 215 | |
| 216 | - public static function formatLine (string $line, array $objects = []): string |
|
| 216 | + public static function formatLine(string $line, array $objects = []): string |
|
| 217 | 217 | { |
| 218 | - if (sizeof ($objects) > 0) |
|
| 218 | + if (sizeof($objects) > 0) |
|
| 219 | 219 | { |
| 220 | - $len = strlen ($line); |
|
| 220 | + $len = strlen($line); |
|
| 221 | 221 | $newLine = ''; |
| 222 | 222 | |
| 223 | - $replacement = array_map (function ($object) |
|
| 223 | + $replacement = array_map(function($object) |
|
| 224 | 224 | { |
| 225 | - return Components::componentExists ($object->selector) !== false ? |
|
| 226 | - '\VoidEngine\_c('. $object->selector .')' : |
|
| 227 | - 'unserialize (\''. serialize ($object) .'\')'; |
|
| 225 | + return Components::componentExists($object->selector) !== false ? |
|
| 226 | + '\VoidEngine\_c('.$object->selector.')' : 'unserialize (\''.serialize($object).'\')'; |
|
| 228 | 227 | }, $objects); |
| 229 | 228 | |
| 230 | - $replacement = array_map (function ($name) |
|
| 229 | + $replacement = array_map(function($name) |
|
| 231 | 230 | { |
| 232 | - return strlen ($name = trim ($name)) + substr_count ($name, '_'); |
|
| 233 | - }, $omap = array_flip ($replacement)); |
|
| 231 | + return strlen($name = trim($name)) + substr_count($name, '_'); |
|
| 232 | + }, $omap = array_flip($replacement)); |
|
| 234 | 233 | |
| 235 | - arsort ($replacement); |
|
| 234 | + arsort($replacement); |
|
| 236 | 235 | |
| 237 | 236 | $nReplacement = []; |
| 238 | 237 | |
@@ -240,14 +239,14 @@ discard block |
||
| 240 | 239 | $nReplacement[$omap[$replaceTo]] = $replaceTo; |
| 241 | 240 | |
| 242 | 241 | $replacement = $nReplacement; |
| 243 | - $blacklist = array_flip (['\'', '"', '$']); |
|
| 242 | + $blacklist = array_flip(['\'', '"', '$']); |
|
| 244 | 243 | |
| 245 | 244 | for ($i = 0; $i < $len; ++$i) |
| 246 | 245 | { |
| 247 | 246 | $replaced = false; |
| 248 | 247 | |
| 249 | 248 | foreach ($replacement as $name => $replaceAt) |
| 250 | - if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 249 | + if (substr($line, $i, ($l = strlen($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 251 | 250 | { |
| 252 | 251 | $newLine .= $replaceAt; |
| 253 | 252 | |
@@ -22,19 +22,20 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array |
| 24 | 24 | { |
| 25 | - if ($syntaxTree instanceof VLFParser) |
|
| 26 | - $syntaxTree = $syntaxTree->tree; |
|
| 27 | - |
|
| 28 | - elseif (!is_array ($syntaxTree) && self::$throw_errors) |
|
| 29 | - throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 25 | + if ($syntaxTree instanceof VLFParser) { |
|
| 26 | + $syntaxTree = $syntaxTree->tree; |
|
| 27 | + } elseif (!is_array ($syntaxTree) && self::$throw_errors) { |
|
| 28 | + throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - foreach ($syntaxTree as $id => $syntaxInfo) |
|
| 32 | - if (isset ($syntaxInfo['type'])) |
|
| 31 | + foreach ($syntaxTree as $id => $syntaxInfo) { |
|
| 32 | + if (isset ($syntaxInfo['type'])) |
|
| 33 | 33 | { |
| 34 | 34 | switch ($syntaxInfo['type']) |
| 35 | 35 | { |
| 36 | 36 | case VLF_OBJECT_DEFINITION: |
| 37 | 37 | $class = $syntaxInfo['info']['object_class']; |
| 38 | + } |
|
| 38 | 39 | $name = $syntaxInfo['info']['object_name']; |
| 39 | 40 | $args = []; |
| 40 | 41 | |
@@ -42,12 +43,15 @@ discard block |
||
| 42 | 43 | { |
| 43 | 44 | $args = $syntaxInfo['info']['arguments']; |
| 44 | 45 | |
| 45 | - foreach ($args as $arg_id => $arg) |
|
| 46 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 46 | + foreach ($args as $arg_id => $arg) { |
|
| 47 | + if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 47 | 48 | $args[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 48 | 49 | self::formatLine ($arg->name, self::$objects) : null; |
| 50 | + } |
|
| 49 | 51 | |
| 50 | - else $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 52 | + else { |
|
| 53 | + $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 54 | + } |
|
| 51 | 55 | } |
| 52 | 56 | |
| 53 | 57 | try |
@@ -57,15 +61,12 @@ discard block |
||
| 57 | 61 | try |
| 58 | 62 | { |
| 59 | 63 | self::$objects[$name]->name = $name; |
| 60 | - } |
|
| 61 | - |
|
| 62 | - catch (\Throwable $e) {} |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - catch (\Throwable $e) |
|
| 64 | + } catch (\Throwable $e) {} |
|
| 65 | + } catch (\Throwable $e) |
|
| 66 | 66 | { |
| 67 | - if (self::$throw_errors) |
|
| 68 | - throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 67 | + if (self::$throw_errors) { |
|
| 68 | + throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 69 | + } |
|
| 69 | 70 | } |
| 70 | 71 | break; |
| 71 | 72 | |
@@ -80,23 +81,24 @@ discard block |
||
| 80 | 81 | $propertyValue = $syntaxInfo['info']['property_value']; |
| 81 | 82 | $preset = ''; |
| 82 | 83 | |
| 83 | - if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) |
|
| 84 | - $propertyValue = isset (self::$objects[$propertyValue->name]) ? |
|
| 84 | + if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) { |
|
| 85 | + $propertyValue = isset (self::$objects[$propertyValue->name]) ? |
|
| 85 | 86 | self::formatLine ($propertyValue->name, self::$objects) : null; |
| 86 | - |
|
| 87 | - elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 87 | + } elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 88 | 88 | { |
| 89 | 89 | $use = substr ($propertyValue, strpos ($propertyValue, 'use')); |
| 90 | 90 | $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos); |
| 91 | 91 | $use = explode (' ', $use); |
| 92 | 92 | |
| 93 | - foreach ($use as $id => $useParam) |
|
| 94 | - if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
|
| 93 | + foreach ($use as $id => $useParam) { |
|
| 94 | + if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
|
| 95 | 95 | { |
| 96 | 96 | $fname = $use[$id + 1]; |
| 97 | + } |
|
| 97 | 98 | |
| 98 | - if (substr ($fname, strlen ($fname) - 1) == ',') |
|
| 99 | - $fname = substr ($fname, 0, -1); |
|
| 99 | + if (substr ($fname, strlen ($fname) - 1) == ',') { |
|
| 100 | + $fname = substr ($fname, 0, -1); |
|
| 101 | + } |
|
| 100 | 102 | |
| 101 | 103 | $preset .= "$fname = $useParam; "; |
| 102 | 104 | |
@@ -105,37 +107,34 @@ discard block |
||
| 105 | 107 | |
| 106 | 108 | $preset = self::formatLine ($preset, self::$objects); |
| 107 | 109 | $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $use), $propertyValue), self::$objects); |
| 110 | + } else { |
|
| 111 | + $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
| 108 | 112 | } |
| 109 | 113 | |
| 110 | - else $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
| 111 | - |
|
| 112 | 114 | try |
| 113 | 115 | { |
| 114 | 116 | self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
| 115 | - } |
|
| 116 | - |
|
| 117 | - catch (\Throwable $e) |
|
| 117 | + } catch (\Throwable $e) |
|
| 118 | 118 | { |
| 119 | 119 | try |
| 120 | 120 | { |
| 121 | 121 | $propertyValue = $syntaxInfo['info']['property_raw_value']; |
| 122 | 122 | |
| 123 | - if (strpos ($propertyName, '->') !== false) |
|
| 124 | - eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
| 125 | - |
|
| 126 | - else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - catch (\Throwable $e) |
|
| 123 | + if (strpos ($propertyName, '->') !== false) { |
|
| 124 | + eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
| 125 | + } else { |
|
| 126 | + self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
|
| 127 | + } |
|
| 128 | + } catch (\Throwable $e) |
|
| 130 | 129 | { |
| 131 | - if (self::$throw_errors) |
|
| 132 | - throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 130 | + if (self::$throw_errors) { |
|
| 131 | + throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 132 | + } |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | + } elseif (self::$throw_errors) { |
|
| 136 | + throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']); |
|
| 135 | 137 | } |
| 136 | - |
|
| 137 | - elseif (self::$throw_errors) |
|
| 138 | - throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']); |
|
| 139 | 138 | break; |
| 140 | 139 | |
| 141 | 140 | case VLF_METHOD_CALL: |
@@ -144,30 +143,32 @@ discard block |
||
| 144 | 143 | $methodName = $syntaxInfo['info']['method_name']; |
| 145 | 144 | $methodArgs = $syntaxInfo['info']['method_arguments']; |
| 146 | 145 | |
| 147 | - foreach ($methodArgs as $arg_id => $arg) |
|
| 148 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 146 | + foreach ($methodArgs as $arg_id => $arg) { |
|
| 147 | + if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 149 | 148 | $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 150 | 149 | self::formatLine ($arg->name, self::$objects) : null; |
| 150 | + } |
|
| 151 | 151 | |
| 152 | - else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 152 | + else { |
|
| 153 | + $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 154 | + } |
|
| 153 | 155 | |
| 154 | 156 | try |
| 155 | 157 | { |
| 156 | - if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
| 157 | - eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
| 158 | - |
|
| 159 | - else self::$objects[$name]->$methodName (...$methodArgs); |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - catch (\Throwable $e) |
|
| 158 | + if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) { |
|
| 159 | + eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
| 160 | + } else { |
|
| 161 | + self::$objects[$name]->$methodName (...$methodArgs); |
|
| 162 | + } |
|
| 163 | + } catch (\Throwable $e) |
|
| 163 | 164 | { |
| 164 | - if (self::$throw_errors) |
|
| 165 | - throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 165 | + if (self::$throw_errors) { |
|
| 166 | + throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 167 | + } |
|
| 166 | 168 | } |
| 169 | + } elseif (self::$throw_errors) { |
|
| 170 | + throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"'); |
|
| 167 | 171 | } |
| 168 | - |
|
| 169 | - elseif (self::$throw_errors) |
|
| 170 | - throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"'); |
|
| 171 | 172 | break; |
| 172 | 173 | |
| 173 | 174 | case VLF_RUNTIME_EXECUTABLE: |
@@ -175,16 +176,18 @@ discard block |
||
| 175 | 176 | break; |
| 176 | 177 | } |
| 177 | 178 | |
| 178 | - if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) |
|
| 179 | - self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 179 | + if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) { |
|
| 180 | + self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 181 | + } |
|
| 182 | + } else { |
|
| 183 | + throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"'); |
|
| 180 | 184 | } |
| 181 | 185 | |
| 182 | - else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"'); |
|
| 183 | - |
|
| 184 | - if (is_dir ($resourcesDir)) |
|
| 185 | - foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir) |
|
| 186 | + if (is_dir ($resourcesDir)) { |
|
| 187 | + foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir) |
|
| 186 | 188 | { |
| 187 | 189 | $baseName = basenameNoExt ($dir); |
| 190 | + } |
|
| 188 | 191 | $info = explode ('.', $baseName); |
| 189 | 192 | |
| 190 | 193 | if (isset (self::$objects[$info[0]])) |
@@ -194,9 +197,9 @@ discard block |
||
| 194 | 197 | $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]); |
| 195 | 198 | |
| 196 | 199 | VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']); |
| 200 | + } else { |
|
| 201 | + VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir)))); |
|
| 197 | 202 | } |
| 198 | - |
|
| 199 | - else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir)))); |
|
| 200 | 203 | } |
| 201 | 204 | } |
| 202 | 205 | |
@@ -236,8 +239,9 @@ discard block |
||
| 236 | 239 | |
| 237 | 240 | $nReplacement = []; |
| 238 | 241 | |
| 239 | - foreach ($replacement as $replaceTo => $nLn) |
|
| 240 | - $nReplacement[$omap[$replaceTo]] = $replaceTo; |
|
| 242 | + foreach ($replacement as $replaceTo => $nLn) { |
|
| 243 | + $nReplacement[$omap[$replaceTo]] = $replaceTo; |
|
| 244 | + } |
|
| 241 | 245 | |
| 242 | 246 | $replacement = $nReplacement; |
| 243 | 247 | $blacklist = array_flip (['\'', '"', '$']); |
@@ -246,10 +250,11 @@ discard block |
||
| 246 | 250 | { |
| 247 | 251 | $replaced = false; |
| 248 | 252 | |
| 249 | - foreach ($replacement as $name => $replaceAt) |
|
| 250 | - if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 253 | + foreach ($replacement as $name => $replaceAt) { |
|
| 254 | + if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 251 | 255 | { |
| 252 | 256 | $newLine .= $replaceAt; |
| 257 | + } |
|
| 253 | 258 | |
| 254 | 259 | $i += $l - 1; |
| 255 | 260 | $replaced = true; |
@@ -257,8 +262,9 @@ discard block |
||
| 257 | 262 | break; |
| 258 | 263 | } |
| 259 | 264 | |
| 260 | - if (!$replaced) |
|
| 261 | - $newLine .= $line[$i]; |
|
| 265 | + if (!$replaced) { |
|
| 266 | + $newLine .= $line[$i]; |
|
| 267 | + } |
|
| 262 | 268 | } |
| 263 | 269 | |
| 264 | 270 | $line = $newLine; |
@@ -31,14 +31,14 @@ |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | public function applyToObject (int $selector): void |
| 34 | - { |
|
| 35 | - VoidEngine::setProperty ($selector, 'Icon', $this->selector); |
|
| 36 | - } |
|
| 34 | + { |
|
| 35 | + VoidEngine::setProperty ($selector, 'Icon', $this->selector); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - public function saveToFile (string $file): void |
|
| 39 | - { |
|
| 40 | - VoidEngine::callMethod ($this->selector, 'Save', $file); |
|
| 41 | - } |
|
| 38 | + public function saveToFile (string $file): void |
|
| 39 | + { |
|
| 40 | + VoidEngine::callMethod ($this->selector, 'Save', $file); |
|
| 41 | + } |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | class Bitmap extends WFObject |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | public $class = 'System.Drawing.Image'; |
| 8 | 8 | public $namespace = 'System.Drawing'; |
| 9 | 9 | |
| 10 | - public function __construct () |
|
| 10 | + public function __construct() |
|
| 11 | 11 | { |
| 12 | - parent::__construct ($this->class); |
|
| 12 | + parent::__construct($this->class); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - public function loadFromFile (string $path) |
|
| 15 | + public function loadFromFile(string $path) |
|
| 16 | 16 | { |
| 17 | - return $this->fromFile ($path); |
|
| 17 | + return $this->fromFile($path); |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | |
@@ -23,21 +23,21 @@ discard block |
||
| 23 | 23 | public $class = 'System.Drawing.Icon'; |
| 24 | 24 | public $namespace = 'System.Drawing'; |
| 25 | 25 | |
| 26 | - public function __construct (string $file) |
|
| 26 | + public function __construct(string $file) |
|
| 27 | 27 | { |
| 28 | - parent::__construct ($this->class); |
|
| 28 | + parent::__construct($this->class); |
|
| 29 | 29 | |
| 30 | - $this->fromFile ($file); |
|
| 30 | + $this->fromFile($file); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function applyToObject (int $selector): void |
|
| 33 | + public function applyToObject(int $selector): void |
|
| 34 | 34 | { |
| 35 | - VoidEngine::setProperty ($selector, 'Icon', $this->selector); |
|
| 35 | + VoidEngine::setProperty($selector, 'Icon', $this->selector); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function saveToFile (string $file): void |
|
| 38 | + public function saveToFile(string $file): void |
|
| 39 | 39 | { |
| 40 | - VoidEngine::callMethod ($this->selector, 'Save', $file); |
|
| 40 | + VoidEngine::callMethod($this->selector, 'Save', $file); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | public $class = 'System.Drawing.Bitmap'; |
| 47 | 47 | public $namespace = 'System.Drawing'; |
| 48 | 48 | |
| 49 | - public function __construct (string $filename) |
|
| 49 | + public function __construct(string $filename) |
|
| 50 | 50 | { |
| 51 | - parent::__construct ($this->class, $this->namespace, [$filename, 'string']); |
|
| 51 | + parent::__construct($this->class, $this->namespace, [$filename, 'string']); |
|
| 52 | 52 | } |
| 53 | 53 | } |
@@ -6,18 +6,18 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.WebBrowser'; |
| 8 | 8 | |
| 9 | - public function back (): void |
|
| 9 | + public function back(): void |
|
| 10 | 10 | { |
| 11 | - $this->callMethod ('GoBack'); |
|
| 11 | + $this->callMethod('GoBack'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function forward (): void |
|
| 14 | + public function forward(): void |
|
| 15 | 15 | { |
| 16 | - $this->callMethod ('GoForward'); |
|
| 16 | + $this->callMethod('GoForward'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function browse (string $url) |
|
| 19 | + public function browse(string $url) |
|
| 20 | 20 | { |
| 21 | - return $this->callMethod ('Navigate', $url); |
|
| 21 | + return $this->callMethod('Navigate', $url); |
|
| 22 | 22 | } |
| 23 | 23 | } |
@@ -6,8 +6,8 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.MessageBox'; |
| 8 | 8 | |
| 9 | - public function __construct () |
|
| 9 | + public function __construct() |
|
| 10 | 10 | { |
| 11 | - parent::__construct ($this->class); |
|
| 11 | + parent::__construct($this->class); |
|
| 12 | 12 | } |
| 13 | 13 | } |
@@ -6,6 +6,6 @@ |
||
| 6 | 6 | |
| 7 | 7 | class FastColoredTextBox extends NoVisual |
| 8 | 8 | { |
| 9 | - public $class = 'FastColoredTextBoxNS.FastColoredTextBox'; |
|
| 9 | + public $class = 'FastColoredTextBoxNS.FastColoredTextBox'; |
|
| 10 | 10 | public $namespace = 'FastColoredTextBox'; |
| 11 | 11 | } |
@@ -2,10 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace VoidEngine; |
| 4 | 4 | |
| 5 | -EngineAdditions::loadModule ('FastColoredTextBox.dll'); |
|
| 5 | +EngineAdditions::loadModule('FastColoredTextBox.dll'); |
|
| 6 | 6 | |
| 7 | 7 | class FastColoredTextBox extends NoVisual |
| 8 | 8 | { |
| 9 | - public $class = 'FastColoredTextBoxNS.FastColoredTextBox'; |
|
| 9 | + public $class = 'FastColoredTextBoxNS.FastColoredTextBox'; |
|
| 10 | 10 | public $namespace = 'FastColoredTextBox'; |
| 11 | 11 | } |
@@ -10,12 +10,12 @@ |
||
| 10 | 10 | protected $panel2; |
| 11 | 11 | |
| 12 | 12 | public function __construct (Component $parent = null) |
| 13 | - { |
|
| 13 | + { |
|
| 14 | 14 | parent::__construct ($parent, $this->class); |
| 15 | 15 | |
| 16 | 16 | $this->panel1 = new SplitterPanel ($this->getProperty ('Panel1')); |
| 17 | 17 | $this->panel2 = new SplitterPanel ($this->getProperty ('Panel2')); |
| 18 | - } |
|
| 18 | + } |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | class SplitterPanel extends Control |
@@ -9,18 +9,18 @@ |
||
| 9 | 9 | protected $panel1; |
| 10 | 10 | protected $panel2; |
| 11 | 11 | |
| 12 | - public function __construct (Component $parent = null) |
|
| 12 | + public function __construct(Component $parent = null) |
|
| 13 | 13 | { |
| 14 | - parent::__construct ($parent, $this->class); |
|
| 14 | + parent::__construct($parent, $this->class); |
|
| 15 | 15 | |
| 16 | - $this->panel1 = new SplitterPanel ($this->getProperty ('Panel1')); |
|
| 17 | - $this->panel2 = new SplitterPanel ($this->getProperty ('Panel2')); |
|
| 16 | + $this->panel1 = new SplitterPanel($this->getProperty('Panel1')); |
|
| 17 | + $this->panel2 = new SplitterPanel($this->getProperty('Panel2')); |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | class SplitterPanel extends Control |
| 22 | 22 | { |
| 23 | - public function __construct (int $selector) |
|
| 23 | + public function __construct(int $selector) |
|
| 24 | 24 | { |
| 25 | 25 | $this->selector = $selector; |
| 26 | 26 | } |
@@ -6,18 +6,18 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.ColorDialog'; |
| 8 | 8 | |
| 9 | - public function __construct () |
|
| 9 | + public function __construct() |
|
| 10 | 10 | { |
| 11 | - parent::__construct ($this->class); |
|
| 11 | + parent::__construct($this->class); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function get_color () |
|
| 14 | + public function get_color() |
|
| 15 | 15 | { |
| 16 | - return $this->getProperty (['Color', 'color']); |
|
| 16 | + return $this->getProperty(['Color', 'color']); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function set_color (int $color) |
|
| 19 | + public function set_color(int $color) |
|
| 20 | 20 | { |
| 21 | - $this->setProperty ('Color', [$color, 'color']); |
|
| 21 | + $this->setProperty('Color', [$color, 'color']); |
|
| 22 | 22 | } |
| 23 | 23 | } |
@@ -12,11 +12,11 @@ |
||
| 12 | 12 | protected $styles; |
| 13 | 13 | |
| 14 | 14 | public function __construct (Component $parent = null) |
| 15 | - { |
|
| 15 | + { |
|
| 16 | 16 | parent::__construct ($parent, $this->class); |
| 17 | 17 | |
| 18 | 18 | $this->styles = $this->getProperty ('Styles'); |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | public function resetSyntax () |
| 22 | 22 | { |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace VoidEngine; |
| 4 | 4 | |
| 5 | -EngineAdditions::loadModule ('ScintillaNET.dll'); |
|
| 5 | +EngineAdditions::loadModule('ScintillaNET.dll'); |
|
| 6 | 6 | |
| 7 | 7 | class Scintilla extends NoVisual |
| 8 | 8 | { |
@@ -11,71 +11,71 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | protected $styles; |
| 13 | 13 | |
| 14 | - public function __construct (Component $parent = null) |
|
| 14 | + public function __construct(Component $parent = null) |
|
| 15 | 15 | { |
| 16 | - parent::__construct ($parent, $this->class); |
|
| 16 | + parent::__construct($parent, $this->class); |
|
| 17 | 17 | |
| 18 | - $this->styles = $this->getProperty ('Styles'); |
|
| 18 | + $this->styles = $this->getProperty('Styles'); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function resetSyntax () |
|
| 21 | + public function resetSyntax() |
|
| 22 | 22 | { |
| 23 | - $this->callMethod ('StyleResetDefault'); |
|
| 23 | + $this->callMethod('StyleResetDefault'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function clearSyntax () |
|
| 26 | + public function clearSyntax() |
|
| 27 | 27 | { |
| 28 | - $this->callMethod ('StyleClearAll'); |
|
| 28 | + $this->callMethod('StyleClearAll'); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - public function setKeywords (int $index, string $keywords) |
|
| 31 | + public function setKeywords(int $index, string $keywords) |
|
| 32 | 32 | { |
| 33 | - $this->callMethod ('SetKeywords', [$index, 'int'], [$keywords, 'string']); |
|
| 33 | + $this->callMethod('SetKeywords', [$index, 'int'], [$keywords, 'string']); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function propertyInit (string $propertyName, $propertyValue) |
|
| 36 | + public function propertyInit(string $propertyName, $propertyValue) |
|
| 37 | 37 | { |
| 38 | - $this->callMethod ('SetProperty', [$propertyName, 'string'], [$propertyValue, 'string']); |
|
| 38 | + $this->callMethod('SetProperty', [$propertyName, 'string'], [$propertyValue, 'string']); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - public function set_syntax ($syntax) |
|
| 41 | + public function set_syntax($syntax) |
|
| 42 | 42 | { |
| 43 | - if (file_exists ($syntax)) |
|
| 44 | - $syntax = file_get_contents ($syntax); |
|
| 43 | + if (file_exists($syntax)) |
|
| 44 | + $syntax = file_get_contents($syntax); |
|
| 45 | 45 | |
| 46 | - $syntax = json_decode ($syntax, true); |
|
| 46 | + $syntax = json_decode($syntax, true); |
|
| 47 | 47 | |
| 48 | 48 | if ( |
| 49 | - !is_array ($syntax['syntax']) || |
|
| 50 | - !is_array ($syntax['references']) || |
|
| 49 | + !is_array($syntax['syntax']) || |
|
| 50 | + !is_array($syntax['references']) || |
|
| 51 | 51 | !isset ($syntax['lexer']) |
| 52 | 52 | ) return false; |
| 53 | 53 | |
| 54 | 54 | else |
| 55 | 55 | { |
| 56 | - $this->resetSyntax (); |
|
| 57 | - $this->clearSyntax (); |
|
| 56 | + $this->resetSyntax(); |
|
| 57 | + $this->clearSyntax(); |
|
| 58 | 58 | |
| 59 | 59 | foreach ($syntax['references'] as $name => $value) |
| 60 | 60 | if (isset ($syntax['syntax'][$name])) |
| 61 | 61 | { |
| 62 | - $element = VoidEngine::getArrayValue ($this->styles, $value); |
|
| 62 | + $element = VoidEngine::getArrayValue($this->styles, $value); |
|
| 63 | 63 | $color = $syntax['syntax'][$name]; |
| 64 | 64 | |
| 65 | - if (defined ($color)) |
|
| 66 | - $color = constant ($color); |
|
| 65 | + if (defined($color)) |
|
| 66 | + $color = constant($color); |
|
| 67 | 67 | |
| 68 | - VoidEngine::setProperty ($element, 'ForeColor', [$color, 'color']); |
|
| 68 | + VoidEngine::setProperty($element, 'ForeColor', [$color, 'color']); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $this->lexer = $syntax['lexer']; |
| 72 | 72 | |
| 73 | - if (is_array ($syntax['keywords'])) |
|
| 73 | + if (is_array($syntax['keywords'])) |
|
| 74 | 74 | foreach ($syntax['keywords'] as $id => $keywords) |
| 75 | - $this->setKeywords ($id, $keywords); |
|
| 75 | + $this->setKeywords($id, $keywords); |
|
| 76 | 76 | |
| 77 | - $this->propertyInit ('fold', 1); |
|
| 78 | - $this->propertyInit ('fold.compact', 1); |
|
| 77 | + $this->propertyInit('fold', 1); |
|
| 78 | + $this->propertyInit('fold.compact', 1); |
|
| 79 | 79 | |
| 80 | 80 | return true; |
| 81 | 81 | } |
@@ -40,8 +40,9 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function set_syntax ($syntax) |
| 42 | 42 | { |
| 43 | - if (file_exists ($syntax)) |
|
| 44 | - $syntax = file_get_contents ($syntax); |
|
| 43 | + if (file_exists ($syntax)) { |
|
| 44 | + $syntax = file_get_contents ($syntax); |
|
| 45 | + } |
|
| 45 | 46 | |
| 46 | 47 | $syntax = json_decode ($syntax, true); |
| 47 | 48 | |
@@ -49,30 +50,33 @@ discard block |
||
| 49 | 50 | !is_array ($syntax['syntax']) || |
| 50 | 51 | !is_array ($syntax['references']) || |
| 51 | 52 | !isset ($syntax['lexer']) |
| 52 | - ) return false; |
|
| 53 | - |
|
| 54 | - else |
|
| 53 | + ) { |
|
| 54 | + return false; |
|
| 55 | + } else |
|
| 55 | 56 | { |
| 56 | 57 | $this->resetSyntax (); |
| 57 | 58 | $this->clearSyntax (); |
| 58 | 59 | |
| 59 | - foreach ($syntax['references'] as $name => $value) |
|
| 60 | - if (isset ($syntax['syntax'][$name])) |
|
| 60 | + foreach ($syntax['references'] as $name => $value) { |
|
| 61 | + if (isset ($syntax['syntax'][$name])) |
|
| 61 | 62 | { |
| 62 | 63 | $element = VoidEngine::getArrayValue ($this->styles, $value); |
| 64 | + } |
|
| 63 | 65 | $color = $syntax['syntax'][$name]; |
| 64 | 66 | |
| 65 | - if (defined ($color)) |
|
| 66 | - $color = constant ($color); |
|
| 67 | + if (defined ($color)) { |
|
| 68 | + $color = constant ($color); |
|
| 69 | + } |
|
| 67 | 70 | |
| 68 | 71 | VoidEngine::setProperty ($element, 'ForeColor', [$color, 'color']); |
| 69 | 72 | } |
| 70 | 73 | |
| 71 | 74 | $this->lexer = $syntax['lexer']; |
| 72 | 75 | |
| 73 | - if (is_array ($syntax['keywords'])) |
|
| 74 | - foreach ($syntax['keywords'] as $id => $keywords) |
|
| 76 | + if (is_array ($syntax['keywords'])) { |
|
| 77 | + foreach ($syntax['keywords'] as $id => $keywords) |
|
| 75 | 78 | $this->setKeywords ($id, $keywords); |
| 79 | + } |
|
| 76 | 80 | |
| 77 | 81 | $this->propertyInit ('fold', 1); |
| 78 | 82 | $this->propertyInit ('fold.compact', 1); |