Merge branch 'fix/lua-templateparser'

Improve the processing of the template macros `#utbl` and `#wxparent` in the Lua code generator.
wxFormBuilder · Jul 17, 2024 · c2564cb · c2564cb
2 parents 1146e49 + cc923b7
commit c2564cb
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 90 deletions.
diff --git a/src/codegen/codegen.cpp b/src/codegen/codegen.cpp
@@ -109,6 +109,8 @@ bool TemplateParser::ParseMacro()
 
     ident = ParseIdent();
     switch (ident) {
+        case ID_NOP:
+            return ParseNop();
         case ID_WXPARENT:
             return ParseWxParent();
             break;
@@ -307,6 +309,12 @@ bool TemplateParser::ParseText()
     return true;
 }
 
+bool TemplateParser::ParseNop()
+{
+    ignore_whitespaces();
+    return true;
+}
+
 bool TemplateParser::ParseInnerTemplate()
 {
     return true;
@@ -860,7 +868,9 @@ TemplateParser::Ident TemplateParser::SearchIdent(wxString ident)
 {
     //  LogDebug("Parsing command %s",ident);
 
-    if (ident == wxT("wxparent"))
+    if (ident == "nop")
+        return ID_NOP;
+    else if (ident == wxT("wxparent"))
         return ID_WXPARENT;
     else if (ident == wxT("ifnotnull"))
         return ID_IFNOTNULL;

diff --git a/src/codegen/codegen.h b/src/codegen/codegen.h
@@ -149,6 +149,7 @@ class TemplateParser
 
     typedef enum {
         ID_ERROR,
+        ID_NOP,
         ID_WXPARENT,
         ID_PARENT,
         ID_FORM,
@@ -201,6 +202,7 @@ class TemplateParser
     Token GetNextToken();
 
 
+    bool ParseNop();
     bool ParseInnerTemplate();
     bool ParseWxParent();
     bool ParseParent();