new typeinfo syntax in both old and new parser

minus one s\r error in new parser
GaijinEntertainment · Oct 31, 2024 · 06c8312 · 06c8312
1 parent 63826a8
commit 06c8312
Show file tree

Hide file tree

Showing 8 changed files with 28,706 additions and 27,981 deletions.
diff --git a/examples/test/misc/hello_world.das b/examples/test/misc/hello_world.das
@@ -347,6 +347,23 @@ def test_pipes() {
 	};
 }
 
+///////////
+// typeinfo
+
+[comment (i=1,f=2.0,s="three",b=false)]
+struct Event {
+    i : int;
+}
+
+[export]
+def test_typeinfo( arg : int ) {
+	let a = typeinfo sizeof(arg);
+	debug(a);
+	let b = typeinfo has_field<add>(type<Baz>);
+	debug(b);
+	let c = typeinfo struct_get_annotation_argument<comment;s>(type<Event>);
+	debug(c);
+}
 
 ///////
 // main

diff --git a/src/parser/ds2_parser.cpp b/src/parser/ds2_parser.cpp
diff --git a/src/parser/ds2_parser.output b/src/parser/ds2_parser.output
diff --git a/src/parser/ds2_parser.ypp b/src/parser/ds2_parser.ypp
@@ -1435,7 +1435,7 @@ expr_type_decl
     ;
 
 expr_type_info
-    :   DAS_TYPEINFO[loc] '(' name_in_namespace[trait] expr[subexpr] ')' {
+    :   DAS_TYPEINFO[loc] name_in_namespace[trait] '('  expr[subexpr] ')' {
             if ( $subexpr->rtti_isTypeDecl() ) {
                 auto ptd = (ExprTypeDecl *)$subexpr;
                 $$ = new ExprTypeInfo(tokAt(scanner,@loc),*$trait,ptd->typeexpr);
@@ -1445,7 +1445,7 @@ expr_type_info
             }
             delete $trait;
     }
-    |   DAS_TYPEINFO[loc] '(' name_in_namespace[trait] '<' NAME[subtrait] '>' expr[subexpr] ')' {
+    |   DAS_TYPEINFO[loc] name_in_namespace[trait] '<' NAME[subtrait] '>' '(' expr[subexpr] ')' {
             if ( $subexpr->rtti_isTypeDecl() ) {
                 auto ptd = (ExprTypeDecl *)$subexpr;
                 $$ = new ExprTypeInfo(tokAt(scanner,@loc),*$trait,ptd->typeexpr,*$subtrait);
@@ -1456,7 +1456,7 @@ expr_type_info
             delete $trait;
             delete $subtrait;
     }
-    |   DAS_TYPEINFO[loc] '(' name_in_namespace[trait] '<' NAME[subtrait] ';' NAME[extratrait] '>' expr[subexpr] ')' {
+    |   DAS_TYPEINFO[loc] name_in_namespace[trait] '<' NAME[subtrait] ';' NAME[extratrait] '>' '(' expr[subexpr] ')' {
             if ( $subexpr->rtti_isTypeDecl() ) {
                 auto ptd = (ExprTypeDecl *)$subexpr;
                 $$ = new ExprTypeInfo(tokAt(scanner,@loc),*$trait,ptd->typeexpr,*$subtrait,*$extratrait);

diff --git a/src/parser/ds_parser.cpp b/src/parser/ds_parser.cpp