fix(t6): anim namespaces & assetmsg devblocks (#227)

xensik · Nov 1, 2024 · ab42b44 · ab42b44
1 parent acd865b
commit ab42b44
Show file tree

Hide file tree

Showing 8 changed files with 722 additions and 682 deletions.
diff --git a/gen/arc/parser.ypp b/gen/arc/parser.ypp
@@ -992,7 +992,9 @@ expr_level
 
 expr_animation
     : MOD IDENTIFIER %prec ANIMREF
-        { $$ = expr_animation::make(@$, $2); };
+        { $$ = expr_animation::make(@$, "", $2); };
+    | MOD IDENTIFIER DOUBLECOLON IDENTIFIER %prec ANIMREF
+        { $$ = expr_animation::make(@$, $2, $4); };
     ;
 
 expr_animtree

diff --git a/include/xsk/arc/common/ast.hpp b/include/xsk/arc/common/ast.hpp
@@ -391,9 +391,10 @@ struct expr_animation : public expr
 {
     using ptr = std::unique_ptr<expr_animation>;
 
+    std::string space;
     std::string value;
 
-    expr_animation(location const& loc, std::string const& value);
+    expr_animation(location const& loc, std::string const& space, std::string const& value);
     friend auto operator==(expr_animation const& lhs, expr_animation const& rhs) -> bool;
     XSK_ARC_AST_MAKE(expr_animation)
 };

diff --git a/include/xsk/arc/parser.hpp b/include/xsk/arc/parser.hpp
@@ -5482,7 +5482,7 @@ switch (yykind)
     /// Constants.
     enum
     {
-      yylast_ = 3307,     ///< Last index in yytable_.
+      yylast_ = 3337,     ///< Last index in yytable_.
       yynnts_ = 102,  ///< Number of nonterminal symbols.
       yyfinal_ = 28 ///< Termination state number.
     };

diff --git a/src/arc/common/ast.cpp b/src/arc/common/ast.cpp
@@ -505,7 +505,7 @@ expr_animtree::expr_animtree(location const& loc) : expr{ type::expr_animtree, l
 {
 }
 
-expr_animation::expr_animation(location const& loc, std::string const& value) : expr{ type::expr_animation, loc }, value{ value }
+expr_animation::expr_animation(location const& loc, std::string const& space, std::string const& value) : expr{ type::expr_animation, loc }, space{ space }, value{ value }
 {
 }
 
@@ -986,7 +986,7 @@ auto operator==(expr_animtree const&, expr_animtree const&) -> bool
 
 auto operator==(expr_animation const& lhs, expr_animation const& rhs) -> bool
 {
-    return lhs.value == rhs.value;
+    return lhs.space == rhs.space && lhs.value == rhs.value;
 }
 
 auto operator==(expr_classes const&, expr_classes const&) -> bool

diff --git a/src/arc/compiler.cpp b/src/arc/compiler.cpp
@@ -1167,7 +1167,7 @@ auto compiler::emit_expr_call_function(expr_function const& exp, bool is_stmt) -
     bool as_dev = false;
     std::string end;
 
-    if (!developer_thread_ && is_stmt && exp.name->value == "assert")
+    if (!developer_thread_ && is_stmt && (exp.name->value == "assert" || exp.name->value == "assertmsg"))
     {
         as_dev = true;
         developer_thread_ = true;
@@ -1804,12 +1804,15 @@ auto compiler::emit_expr_vector(expr_vector const& exp) -> void
 
 auto compiler::emit_expr_animation(expr_animation const& exp) -> void
 {
-    if (animtree_.empty())
+    if (exp.space == "" && animtree_.empty())
     {
         throw comp_error(exp.loc(), "trying to use animation without specified using animtree");
     }
 
-    emit_opcode(opcode::OP_GetAnimation, { animtree_, exp.value });
+    if (exp.space != "")
+        emit_opcode(opcode::OP_GetAnimation, { exp.space, exp.value });
+    else
+        emit_opcode(opcode::OP_GetAnimation, { animtree_, exp.value });
 }
 
 auto compiler::emit_expr_animtree(expr_animtree const& exp) -> void

diff --git a/src/arc/decompiler.cpp b/src/arc/decompiler.cpp
@@ -241,23 +241,40 @@ auto decompiler::decompile_instruction(instruction const& inst, bool last) -> vo
         case opcode::OP_GetAnimation:
         {
             auto found = false;
+            auto space = ""s;
 
             for (auto i = program_->declarations.rbegin(); i != program_->declarations.rend(); i++)
             {
                 if ((*i)->is<decl_usingtree>())
                 {
                     found = (*i)->as<decl_usingtree>().name->value == inst.data[0];
+                    space = (*i)->as<decl_usingtree>().name->value;
                     break;
                 }
             }
 
             if (!found)
             {
-                auto dec = decl_usingtree::make(loc, expr_string::make(loc, inst.data[0]));
-                program_->declarations.push_back(std::move(dec));
+                if (space == "")
+                {
+                    auto dec = decl_usingtree::make(loc, expr_string::make(loc, inst.data[0]));
+                    program_->declarations.push_back(std::move(dec));
+                    stack_.push(expr_animation::make(loc, "", inst.data[1]));
+                }
+                else
+                {
+                    stack_.push(expr_animation::make(loc, inst.data[0], inst.data[1]));
+                }
+            }
+            else if (space == inst.data[0])
+            {
+                stack_.push(expr_animation::make(loc, "", inst.data[1]));
+            }
+            else
+            {
+                stack_.push(expr_animation::make(loc, inst.data[0], inst.data[1]));
             }
 
-            stack_.push(expr_animation::make(loc, inst.data[1]));
             break;
         }
         case opcode::OP_GetFunction:
@@ -1462,7 +1479,9 @@ auto decompiler::decompile_devblocks(stmt_list& stm) -> void
 
                 if (st->as<stmt_expr>().value->is<expr_call>() && st->as<stmt_expr>().value->as<expr_call>().value->is<expr_function>())
                 {
-                    if (st->as<stmt_expr>().value->as<expr_call>().value->as<expr_function>().name->value == "assert")
+                    auto func = st->as<stmt_expr>().value->as<expr_call>().value->as<expr_function>().name->value;
+
+                    if (func == "assert" || func == "assertmsg")
                     {
                         stm.list.insert(stm.list.begin() + i, std::move(list_stmt->list.at(0)));
                         continue;