winforms-php / VoidFramework

engine/extensions/VLF/bin/VST/Parser.php

Braces +53 added lines, -39 removed lines

@@ -25,8 +25,9 @@ 
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vst))
-            $vst = file_get_contents ($vst);
+        if (file_exists ($vst)) {
+                    $vst = file_get_contents ($vst);
+        }
 
         $lines   = explode (self::$divider, $vst);
         $skip_at = -1;
@@ -35,24 +36,26 @@ 
         {
             // \VoidEngine\pre ($line_num .', '. ($skip_at > $line_num ? 'skip' : 'not skip') .': '. $line);
 
-            if ($skip_at > $line_num || !self::filter ($line))
-                continue;
+            if ($skip_at > $line_num || !self::filter ($line)) {
+                            continue;
+            }
 
             $height = self::getHeight ($line);
             $words  = array_filter (explode (' ', $line), 'VLF\Parser::filter');
             $poped  = false;
 
             # Очищаем стек объектов
-            while ($objects->size () > 0)
-                if ($objects->current ()->height >= $height)
+            while ($objects->size () > 0) {
+                            if ($objects->current ()->height >= $height)
                 {
                     $objects->pop ();
+            }
                     
                     $poped = true;
+                } else {
+                    break;
                 }
 
-                else break;
-
             # Создаём новую ссылку на объект
             if ($poped && $objects->size () > 0)
             {
@@ -72,10 +75,11 @@ 
                  */
                 if (isset ($words[0][1]))
                 {
-                    if ($words[0][1] == '^')
-                        $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
-
-                    else throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    if ($words[0][1] == '^') {
+                                            $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    }
                 }
 
                 continue;
@@ -97,17 +101,19 @@ 
                     {
                         $parents = trim (substr ($line, $pos + 1));
 
-                        if (strlen ($parents) == 0)
-                            $parents = null;
-
-                        else $parents = array_map ('trim', explode (',', $parents));
+                        if (strlen ($parents) == 0) {
+                                                    $parents = null;
+                        } else {
+                            $parents = array_map ('trim', explode (',', $parents));
+                        }
                     }
+                } else {
+                    $name = trim (substr ($line, 1));
                 }
 
-                else $name = trim (substr ($line, 1));
-
-                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height)
-                    $parents = [$objects->current ()->args['name']];
+                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height) {
+                                    $parents = [$objects->current ()->args['name']];
+                }
 
                 $objects->push (new Node ([
                     'type'   => \VLF\STYLE_DEFINITION,
@@ -141,17 +147,19 @@ 
                     {
                         $parents = trim (substr ($line, $pos + 1));
 
-                        if (strlen ($parents) == 0)
-                            $parents = null;
-
-                        else $parents = array_map ('trim', explode (',', $parents));
+                        if (strlen ($parents) == 0) {
+                                                    $parents = null;
+                        } else {
+                            $parents = array_map ('trim', explode (',', $parents));
+                        }
                     }
+                } else {
+                    $name = trim (substr ($line, 1));
                 }
 
-                else $name = trim (substr ($line, 1));
-
-                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height)
-                    $parents = [$objects->current ()->args['name']];
+                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height) {
+                                    $parents = [$objects->current ()->args['name']];
+                }
 
                 $objects->push (new Node ([
                     'type'   => \VLF\STYLE_DEFINITION,
@@ -174,11 +182,13 @@ 
              */
             elseif (($pos = strpos ($line, ':')) !== false)
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                }
 
-                if (!isset ($words[1]))
-                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                if (!isset ($words[1])) {
+                                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                }
 
                 $propertyName  = substr ($line, 0, $pos);
                 $propertyValue = substr ($line, $pos + 1);
@@ -212,25 +222,27 @@ 
              */
             elseif (isset ($words[0][1]) && $words[0][0] == '-' && $words[0][1] == '>')
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                }
 
                 $methodArgs = [];
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $methodArgs = substr ($line, $pos + 1, $end - $pos - 1);
 
                     $methodName = trim (substr ($line, 2, $pos - 2));
                     $methodArgs = self::filter ($methodArgs) ?
                         self::parseArguments ($methodArgs) : [];
+                } else {
+                    $methodName = trim (substr ($line, 2));
                 }
 
-                else $methodName = trim (substr ($line, 2));
-
                 $objects->current ()->push (new Node ([
                     'type'   => \VLF\METHOD_CALL,
                     'line'   => $line,
@@ -247,7 +259,9 @@ 
             /**
              * Неопознанная структура
              */
-            else throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            else {
+                throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            }
         }
 
         return $tree;

engine/extensions/VLF/bin/VST/Interpreter.php

Braces +10 added lines, -8 removed lines

@@ -36,22 +36,24 @@
                 $name  = $node->args['name'];
                 $nodes = $node->getNodes ();
 
-                if ($node->args['parents'] !== null)
-                    foreach ($node->args['parents'] as $parent)
+                if ($node->args['parents'] !== null) {
+                                    foreach ($node->args['parents'] as $parent)
                         if (!isset (self::$styles[$parent]) && !isset (self::$default_styles[$parent]))
                         {
                             if (self::$throw_errors)
                                 throw new \Exception ('Style "'. $parent .'" not founded');
+                }
+                        } else {
+                            $nodes = array_merge (self::$styles[$parent] ?? self::$default_styles[$parent], $nodes);
                         }
 
-                        else $nodes = array_merge (self::$styles[$parent] ?? self::$default_styles[$parent], $nodes);
-
-                if ($node->args['is_default'])
-                    self::$default_styles[$name] = isset (self::$objects[$name]) ?
+                if ($node->args['is_default']) {
+                                    self::$default_styles[$name] = isset (self::$objects[$name]) ?
                         array_merge (self::$default_styles[$name], $nodes) : $nodes;
-
-                else self::$styles[$name] = isset (self::$objects[$name]) ?
+                } else {
+                    self::$styles[$name] = isset (self::$objects[$name]) ?
                     array_merge (self::$styles[$name], $nodes) : $nodes;
+                }
             }
 
             list (self::$styles, self::$default_styles) = self::run (new AST (array_map (

engine/extensions/VLF/bin/parser.php

Braces +63 added lines, -50 removed lines

@@ -22,8 +22,9 @@ 
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vlf))
-            $vlf = file_get_contents ($vlf);
+        if (file_exists ($vlf)) {
+                    $vlf = file_get_contents ($vlf);
+        }
 
         $lines   = explode (self::$divider, $vlf);
         $skip_at = -1;
@@ -32,24 +33,26 @@ 
         {
             // \VoidEngine\pre ($line_num .', '. ($skip_at > $line_num ? 'skip' : 'not skip') .': '. $line);
 
-            if ($skip_at > $line_num || !self::filter ($line))
-                continue;
+            if ($skip_at > $line_num || !self::filter ($line)) {
+                            continue;
+            }
 
             $height = self::getHeight ($line);
             $words  = array_filter (explode (' ', $line), 'VLF\Parser::filter');
             $poped  = false;
 
             # Очищаем стек объектов
-            while ($objects->size () > 0)
-                if ($objects->current ()->height >= $height)
+            while ($objects->size () > 0) {
+                            if ($objects->current ()->height >= $height)
                 {
                     $objects->pop ();
+            }
                     
                     $poped = true;
+                } else {
+                    break;
                 }
 
-                else break;
-
             # Создаём новую ссылку на объект
             if ($poped && $objects->size () > 0)
             {
@@ -95,10 +98,11 @@ 
                  */
                 if (isset ($words[0][1]))
                 {
-                    if ($words[0][1] == '^')
-                        $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
-
-                    else throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    if ($words[0][1] == '^') {
+                                            $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    }
                 }
 
                 continue;
@@ -122,9 +126,9 @@ 
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
                     }
-
-                    else throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
                 }
 
                 $tree->push (new Node ([
@@ -144,11 +148,13 @@ 
              */
             elseif (($pos = strpos ($line, ':')) !== false)
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                }
 
-                if (!isset ($words[1]))
-                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                if (!isset ($words[1])) {
+                                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                }
 
                 $propertyName  = substr ($line, 0, $pos);
                 $propertyValue = substr ($line, $pos + 1);
@@ -182,25 +188,27 @@ 
              */
             elseif (isset ($words[0][1]) && $words[0][0] == '-' && $words[0][1] == '>')
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                }
 
                 $methodArgs = [];
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $methodArgs = substr ($line, $pos + 1, $end - $pos - 1);
 
                     $methodName = trim (substr ($line, 2, $pos - 2));
                     $methodArgs = self::filter ($methodArgs) ?
                         self::parseArguments ($methodArgs) : [];
+                } else {
+                    $methodName = trim (substr ($line, 2));
                 }
 
-                else $methodName = trim (substr ($line, 2));
-
                 $objects->current ()->push (new Node ([
                     'type'   => METHOD_CALL,
                     'line'   => $line,
@@ -224,13 +232,15 @@ 
                 $args   = [];
                 $styles = [];
 
-                if ($objects->size () > 0 && $objects->current ()->height < $height)
-                    $args[] = $objects->current ()->args['name'];
+                if ($objects->size () > 0 && $objects->current ()->height < $height) {
+                                    $args[] = $objects->current ()->args['name'];
+                }
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $args = substr ($line, $pos + 1, $end - $pos - 1);
 
@@ -243,8 +253,9 @@ 
                 {
                     $styles = trim (substr ($line, $end + 3));
 
-                    if (strlen ($styles) == 0)
-                        throw new \Exception ('Trying to set empty style to object');
+                    if (strlen ($styles) == 0) {
+                                            throw new \Exception ('Trying to set empty style to object');
+                    }
 
                     $styles = array_map ('trim', explode (',', $styles));
                 }
@@ -269,7 +280,9 @@ 
             /**
              * Неопознанная структура
              */
-            else throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            else {
+                throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            }
         }
 
         return $tree;
@@ -291,8 +304,9 @@ 
         {
             ++$height;
 
-            if ($line[$i] == "\t")
-                $height += 3;
+            if ($line[$i] == "\t") {
+                            $height += 3;
+            }
 
             ++$i;
         }
@@ -329,8 +343,9 @@ 
 
         foreach ($lines as $line_id => $line)
         {
-            if ($line_id <= $begin_id)
-                continue;
+            if ($line_id <= $begin_id) {
+                            continue;
+            }
 
             if (!self::filter ($line))
             {
@@ -341,10 +356,11 @@ 
 
             $height = self::getHeight ($line);
 
-            if ($height > $down_height)
-                $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
-
-            else return [$parsed, $line_id];
+            if ($height > $down_height) {
+                            $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
+            } else {
+                return [$parsed, $line_id];
+            }
         }
 
         return [$parsed, $line_id + 1];
@@ -370,18 +386,15 @@ 
         {
             $t .= $arguments[$i];
             
-            if ($arguments[$i] == '\\')
-                $canSplit = $i + 1;
-
-            elseif ($canSplit < $i)
+            if ($arguments[$i] == '\\') {
+                            $canSplit = $i + 1;
+            } elseif ($canSplit < $i)
             {
-                if ($arguments[$i] == '\'' && !$split2)
-                    $split1 = !$split1;
-
-                elseif ($arguments[$i] == '"' && !$split1)
-                    $split2 = !$split2;
-
-                elseif (!$split1 && !$split2 && $arguments[$i] == ',')
+                if ($arguments[$i] == '\'' && !$split2) {
+                                    $split1 = !$split1;
+                } elseif ($arguments[$i] == '"' && !$split1) {
+                                    $split2 = !$split2;
+                } elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
                     $args[] = substr ($t, 0, -1);
                     $t = '';

engine/extensions/VLF/bin/interpreter.php

Braces +67 added lines, -65 removed lines

@@ -33,15 +33,17 @@ 
                     $name  = $node->args['name'];
                     $args  = [];
 
-                    if (isset (self::$objects[$name]))
-                        break;
+                    if (isset (self::$objects[$name])) {
+                                            break;
+                    }
 
                     if (isset ($node->args['args']))
                     {
                         $args = $node->args['args'];
 
-                        foreach ($args as $arg_id => $arg)
-                            $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                        foreach ($args as $arg_id => $arg) {
+                                                    $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                        }
                     }
 
                     try
@@ -51,15 +53,12 @@ 
                         try
                         {
                             self::$objects[$name]->name = $name;
-                        }
-
-                        catch (\Throwable $e) {}
-                    }
-
-                    catch (\Throwable $e)
+                        } catch (\Throwable $e) {}
+                    } catch (\Throwable $e)
                     {
-                        if (self::$throw_errors)
-                            throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                        if (self::$throw_errors) {
+                                                    throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                        }
                     }
                 break;
 
@@ -78,13 +77,15 @@ 
                             $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
                             $use = explode (' ', $use);
 
-                            foreach ($use as $id => $useParam)  
-                                if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
+                            foreach ($use as $id => $useParam) {
+                                                            if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
                                 {
                                     $fname = $use[$id + 1];
+                            }
 
-                                    if (substr ($fname, strlen ($fname) - 1) == ',')
-                                        $fname = substr ($fname, 0, -1);
+                                    if (substr ($fname, strlen ($fname) - 1) == ',') {
+                                                                            $fname = substr ($fname, 0, -1);
+                                    }
 
                                     $preset .= "$fname = $useParam; ";
 
@@ -93,27 +94,26 @@ 
 
                             $preset        = self::formatLine ($preset, self::$objects);
                             $propertyValue = self::formatLine (str_replace ($ouse, implode (' ', $use), $propertyValue), self::$objects);
+                        } else {
+                            $propertyValue = self::formatLine ($propertyValue, self::$objects);
                         }
 
-                        else $propertyValue = self::formatLine ($propertyValue, self::$objects);
-
                         try
                         {
-							if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls)
-                                eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
-                            
-                            else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
-                        }
-
-                        catch (\Throwable $e)
+							if (strpos ($propertyName, '->') !== false && self::$allow_multimethods_calls) {
+							                                eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
+							} else {
+                                self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
+                            }
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
+                    } elseif (self::$throw_errors) {
+                                            throw new \Exception ('Setting property to an non-object at line "'. $node->line);
                     }
-
-                    elseif (self::$throw_errors)
-                        throw new \Exception ('Setting property to an non-object at line "'. $node->line);
                 break;
 
                 case METHOD_CALL:
@@ -124,29 +124,28 @@ 
                         $methodName = $node->args['name'];
                         $methodArgs = $node->args['args'];
 
-                        foreach ($methodArgs as $arg_id => $arg)
-                            $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                        foreach ($methodArgs as $arg_id => $arg) {
+                                                    $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                        }
 
                         try
                         {
-                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls)
-                                eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
-
-                            elseif (sizeof ($methodArgs) > 0)
-                                self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
-
-                            else self::$objects[$name]->$methodName ();
-                        }
-
-                        catch (\Throwable $e)
+                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) {
+                                                            eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                            } elseif (sizeof ($methodArgs) > 0) {
+                                                            self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
+                            } else {
+                                self::$objects[$name]->$methodName ();
+                            }
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                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);
+                            if (self::$throw_errors) {
+                                                            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);
+                            }
                         }
+                    } elseif (self::$throw_errors) {
+                                            throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
                     }
-
-                    elseif (self::$throw_errors)
-                        throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
                 break;
 
                 case STYLES_IMPORTING:
@@ -156,11 +155,10 @@ 
 
                         if (!file_exists ($path))
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
-                        }
-                        
-                        elseif (!isset (self::$imported_styles[$path]))
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
+                            }
+                        } elseif (!isset (self::$imported_styles[$path]))
                         {
                             \VLF\VST\Interpreter::run (\VLF\VST\Parser::parse (file_get_contents ($path)));
 
@@ -178,16 +176,17 @@ 
 
             if ($node->type == OBJECT_DEFINITION)
             {
-                if (isset (\VLF\VST\Interpreter::$default_styles[$node->args['class']]))
-                    $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$default_styles[$node->args['class']]);
+                if (isset (\VLF\VST\Interpreter::$default_styles[$node->args['class']])) {
+                                    $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$default_styles[$node->args['class']]);
+                }
 
-                if (isset ($node->args['styles']))
-                    foreach ($node->args['styles'] as $style)
+                if (isset ($node->args['styles'])) {
+                                    foreach ($node->args['styles'] as $style)
                         if (isset (\VLF\VST\Interpreter::$styles[$style]))
                             $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$styles[$style]);
-
-                        elseif (self::$throw_errors)
-                            throw new \Exception ('Trying to set undefined style "'. $style .'" to object at line "'. $node->line .'"');
+                } elseif (self::$throw_errors) {
+                                                    throw new \Exception ('Trying to set undefined style "'. $style .'" to object at line "'. $node->line .'"');
+                        }
             }
 
             self::$objects = self::run (new AST (array_map (
@@ -228,8 +227,9 @@ 
 
             $nReplacement = [];
 
-            foreach ($replacement as $replaceTo => $nLn)
-                $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            foreach ($replacement as $replaceTo => $nLn) {
+                            $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            }
 
             $replacement = $nReplacement;
             $blacklist   = array_flip (['\'', '"', '$']);
@@ -238,10 +238,11 @@ 
             {
                 $replaced = false;
 
-                foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                foreach ($replacement as $name => $replaceAt) {
+                                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
+                }
 
                         $i += $l - 1;
                         $replaced = true;
@@ -249,8 +250,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/common/EngineInterfaces.php

Braces +45 added lines, -51 removed lines

@@ -12,16 +12,17 @@ 
 
     public function __construct ($name, $assembly = false, ...$args)
     {
-        foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        foreach ($args as $id => $arg) {
+                    $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        }
         
-        if (is_int ($name) && VoidCore::objectExists ($name))
-            $this->selector = $name;
-
-        elseif (is_string ($name))
-            $this->selector = VoidCore::createObject ($name, $assembly, ...$args);
-
-        else throw new \Exception ('Incorrect params passed');
+        if (is_int ($name) && VoidCore::objectExists ($name)) {
+                    $this->selector = $name;
+        } elseif (is_string ($name)) {
+                    $this->selector = VoidCore::createObject ($name, $assembly, ...$args);
+        } else {
+            throw new \Exception ('Incorrect params passed');
+        }
 
         /*$this->isCollection = $this->getType ()
             ->isSubclassOf (VoidCore::typeof ('System.Collectons.Generic.ICollection'));*/
@@ -43,9 +44,7 @@ 
                 try
                 {
                     return $this->getProperty ('Count');
-                }
-
-                catch (\WinformsException $e)
+                } catch (\WinformsException $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -55,8 +54,9 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
+				for ($i = 0; $i < $size; ++$i) {
+				                    $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
+				}
                 
                 return $list;
             break;
@@ -65,13 +65,12 @@ 
                 $size  = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = VoidCore::getProperty (VoidCore::getArrayValue ($this->selector, [$i, VC_OBJECT]), 'Text');
-                    }
-
-                    catch (\WinformsException $e)
+                }
+                    } catch (\WinformsException $e)
                     {
                         $names[] = VoidCore::getArrayValue ($this->selector, [$i, VC_STRING]);
                     }
@@ -80,8 +79,9 @@ 
             break;
         }
 
-        if (method_exists ($this, $method = 'get_'. $name))
-            return $this->$method ();
+        if (method_exists ($this, $method = 'get_'. $name)) {
+                    return $this->$method ();
+        }
 
         return isset ($this->$name) ?
             $this->$name : EngineAdditions::coupleSelector ($this->getProperty ($name));
@@ -89,13 +89,13 @@ 
 
     public function __set (string $name, $value): void
     {
-        if (substr ($name, -5) == 'Event')
-            Events::setEvent ($this->selector, substr ($name, 0, -5), $value);
-
-        elseif (method_exists ($this, $method = 'set_'. $name))
-            $this->$method ($value);
-        
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        if (substr ($name, -5) == 'Event') {
+                    Events::setEvent ($this->selector, substr ($name, 0, -5), $value);
+        } elseif (method_exists ($this, $method = 'set_'. $name)) {
+                    $this->$method ($value);
+        } else {
+            $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        }
     }
 
     public function __call (string $name, array $args)
@@ -130,9 +130,7 @@ 
             $index === null ?
                 $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
                 $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $index === null ?
                 VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) :
@@ -155,9 +153,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\WinformsException $e)
+        } catch (\WinformsException $e)
         {
             return false;
         }
@@ -171,8 +167,9 @@ 
     {
         $size = $this->count;
 
-        for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        for ($i = 0; $i < $size; ++$i) {
+                    $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        }
     }
 
     public function where (callable $comparator, string $type = null): array
@@ -180,9 +177,10 @@ 
         $size   = $this->count;
         $return = [];
 
-        for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+        for ($i = 0; $i < $size; ++$i) {
+                    if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
+        }
 
         return $return;
     }
@@ -206,16 +204,12 @@ 
         try
         {
             $info['name'] = $this->getProperty ('Name');
-        }
-
-        catch (\WinformsException $e) {}
+        } catch (\WinformsException $e) {}
 
         try
         {
             $info['info'] = $this->callMethod ('ToString');
-        }
-
-        catch (\WinformsException $e) {}
+        } catch (\WinformsException $e) {}
 
         return $info;
     }
@@ -225,13 +219,13 @@ 
 {
     public function __construct ($name, $assembly = false)
     {
-        if (is_int ($name) && VoidCore::objectExists ($name))
-            $this->selector = $name;
-
-        elseif (is_string ($name))
-            $this->selector = VoidCore::getClass ($name, $assembly);
-
-        else throw new \Exception ('Incorrect params passed');
+        if (is_int ($name) && VoidCore::objectExists ($name)) {
+                    $this->selector = $name;
+        } elseif (is_string ($name)) {
+                    $this->selector = VoidCore::getClass ($name, $assembly);
+        } else {
+            throw new \Exception ('Incorrect params passed');
+        }
     }
 }