Fixed errors in compiled files

Author: ProgMiner

.gitattributes

@@ -2,3 +2,5 @@
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
 /scheme.md          export-ignore
+
+*.pdata             export-ignore

.gitignore

@@ -1,4 +1,2 @@
 /vendor/
 composer.phar
-
-Data_*.php

app/Compiler.php

@@ -83,13 +83,13 @@ protected function compileClass(ClassModel $classModel, FileModel $fileModel): s
             }
 
             // TODO Direct default value set
-            $result .= " \${$fieldModel->name} = null;\n";
+            $result .= " \${$fieldModel->name} = {$fieldModel->type->getDefaultValue()};\n";
         }
 
         $result .= "public function __construct(array \$init = []) {\n";
 
         foreach ($classModel->fields as $fieldModel) {
-            if (!isset($fieldModel->default)) {
+            if (is_null($fieldModel->default)) {
                 continue;
             }
 
@@ -116,11 +116,18 @@ protected function compileClass(ClassModel $classModel, FileModel $fileModel): s
         foreach ($classModel->fields as $fieldModel) {
             $fieldModel->type->fixClassName($fileModel);
 
-            $result .= "public function get_{$fieldModel->name}(){$fieldModel->type->makeReturnTypeTip()} { return \$this->{$fieldModel->name}; }\n";
+            $result .= "public function ";
+
+            if ($fieldModel->editable) {
+                $result .= '&';
+            }
+
+            $result .= "get_{$fieldModel->name}() { return \$this->{$fieldModel->name}; }\n";
 
             if (!$fieldModel->type->isMixed() || !empty($fieldModel->validation)) {
-                $result .= "protected function validate_{$fieldModel->name}".
-                        "({$fieldModel->type->makeArgumentTypeTip()}\$value){$fieldModel->type->makeReturnTypeTip()} {\n";
+                $result .= "protected function validate_{$fieldModel->name}(\$value) {\n";
+
+                $result .= $fieldModel->type->makeValidator('$value', "Field {$fieldModel->name} has type {$fieldModel->type->getName()}");
 
                 foreach ($fieldModel->validators as $validator) {
                     if (!isset($this->validators[$validator])) {
@@ -134,8 +141,7 @@ protected function compileClass(ClassModel $classModel, FileModel $fileModel): s
             }
 
             if ($fieldModel->editable) {
-                $result .= "public function set_{$fieldModel->name}".
-                        "({$fieldModel->type->makeArgumentTypeTip()}\$value) { ".
+                $result .= "public function set_{$fieldModel->name}(\$value) { ".
                         "\$this->{$fieldModel->name} = \$this->validate_{$fieldModel->name}(\$value);".
                         "}\n";
             }

app/Type.php

@@ -28,6 +28,8 @@
 
 /**
  * Type representation
+ *
+ * TODO Not nullable
  */
 class Type {
 
@@ -38,6 +40,11 @@ class Type {
      */
     protected $name = '';
 
+    /**
+     * @var bool Is field nullable?
+     */
+    protected $nullable = true;
+
     /**
      * @var bool Is type mixed?
      */
@@ -52,15 +59,50 @@ class Type {
      * @param string $type Type name of class
      */
     public function __construct(string $type) {
-        $type = strtolower($type);
-
         $this->name = $type;
 
+        $type = strtolower($type);
+
         if ($type === 'mixed') {
             $this->mixed = true;
         } else if (!in_array($type, self::TYPES)) {
             $this->class = true;
         }
+
+        if (!$this->class) {
+            $this->name = $type;
+        }
+    }
+
+    /**
+     * Returns default value for this type
+     *
+     * @return string
+     */
+    public function getDefaultValue(): string {
+        if ($this->nullable || $this->mixed || $this->class) {
+            return 'null';
+        }
+
+        switch ($this->name) {
+        case 'array':
+            return '[]';
+
+        case 'bool':
+            return 'false';
+
+        case 'float':
+            return '0.0';
+
+        case 'int':
+            return '0';
+
+        case 'string':
+            return '""';
+
+        }
+
+        return 'null';
     }
 
     /**
@@ -78,37 +120,35 @@ public function fixClassName(FileModel $fileModel) {
             return;
         }
 
-        $this->name = $fileModel->getClassPath($this->name);
+        $this->name = '\\'.$fileModel->getClassPath($this->name);
     }
 
     /**
-     * Makes type tip for return
+     * Makes validation code for this type
      *
      * If type is mixed returns empty string
      *
+     * @param string $expr      Expression for validating
+     * @param string $exception Message for exception
+     *
      * @return string Type tip prefixed by ": " or empty
      */
-    public function makeReturnTypeTip(): string {
+    public function makeValidator(string $expr, string $exception = 'Invalid type'): string {
         if ($this->mixed) {
             return '';
         }
 
-        return ': '.$this->name;
-    }
+        $result = 'if (!is_';
 
-    /**
-     * Makes type tip for argument
-     *
-     * If type is mixed returns empty string
-     *
-     * @return string Type tip suffixed by " " or empty
-     */
-    public function makeArgumentTypeTip(): string {
-        if ($this->mixed) {
-            return '';
+        if ($this->class) {
+            $result .= "a($expr, {$this->name}::class)";
+        } else {
+            $result .= "{$this->name}($expr)";
         }
 
-        return $this->name.' ';
+        $result .= " && !is_null($expr)) { throw new \InvalidArgumentException('$exception'); }";
+
+        return "$result\n";
     }
 
     public function getName(): string {