浏览代码

Fix typescript style class member declarations

mingodad 9 年之前
父节点
当前提交
f7753fc37d
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      SquiLu/squirrel/sqcompiler.cpp

+ 6 - 4
SquiLu/squirrel/sqcompiler.cpp

@@ -1636,9 +1636,12 @@ function_params_decl:
                     if(addClassMember)
                     if(addClassMember)
                     {
                     {
                         AddClassMemberExists(member_names, obj_id);
                         AddClassMemberExists(member_names, obj_id);
-                        _fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetConstant(obj_id));
-                        _fs->AddInstruction(_OP_LOADNULLS, _fs->PushTarget(), 1);
-                        break;
+                        if(_token != _SC('='))
+                        {
+                            _fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetConstant(obj_id));
+                            _fs->AddInstruction(_OP_LOADNULLS, _fs->PushTarget(), 1);
+                            break;
+                        }
                     }
                     }
 				}
 				}
 				if(_token == _SC(':')){
 				if(_token == _SC(':')){
@@ -1663,7 +1666,6 @@ function_params_decl:
                     cppDestructor = true;
                     cppDestructor = true;
                     Lex();
                     Lex();
                     goto member_has_type;
                     goto member_has_type;
-                    continue;
                 }
                 }
             case TK_CONSTEXPR:
             case TK_CONSTEXPR:
                 if(isClass)
                 if(isClass)