today()

christoph2 · Aug 6, 2024 · 67d1ffa · 67d1ffa
1 parent ef7a798
commit 67d1ffa
Show file tree

Hide file tree

Showing 3 changed files with 152 additions and 155 deletions.
diff --git a/pya2l/aml.g4 b/pya2l/aml.g4
@@ -88,11 +88,12 @@ struct_type_name:
     ;
 
 struct_member:
-     m = member | block_definition ';'
+     m = member';'
    ;
 
 member:
     t = type_name (a += array_specifier)*
+	| b = block_definition
     ;
 
 array_specifier:
@@ -106,9 +107,9 @@ taggedstruct_type_name:
 
 taggedstruct_member:
 	  ts1 = taggedstruct_definition ';'
-    | '(' ts0 = taggedstruct_definition ')' '*' ';'
+    | '(' ts0 = taggedstruct_definition ';'? ')' '*' ';'
     | bl1 = block_definition ';'
-	| '(' bl0 = block_definition ')' '*' ';'
+	| '(' bl0 = block_definition ';'? ')' '*' ';'
     ;
 
 taggedstruct_definition:

diff --git a/pya2l/aml_parser.cpp b/pya2l/aml_parser.cpp
@@ -12,9 +12,8 @@ using namespace antlr4;
 
 void marshal(std::stringstream& ss, const AmlFile& amlf);
 
-const std::string BASE{ "C:/csProjects/" };
-//const std::string BASE{ ""C:/Users/HP/PycharmProjects/" };
-
+// const std::string BASE{ "C:/csProjects/" };
+const std::string BASE{ "C:/Users/HP/PycharmProjects/" };
 
 int main(int argc, const char* argv[]) {
     std::ifstream stream;