Change ? to NULL keyword

lszeremeta · Aug 6, 2020 · c7f1bd2 · c7f1bd2
1 parent eb13276
commit c7f1bd2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/yarspg/YARSpg.g4 b/yarspg/YARSpg.g4
@@ -174,8 +174,8 @@ prop_schema
     ;
 
 value_schema
-    : primitive_value_schema ('ID' | '?')?
-    | complex_value_schema '?'?
+    : primitive_value_schema ('ID' | 'NULL')?
+    | complex_value_schema 'NULL'?
     ;
 
 primitive_value_schema
@@ -204,15 +204,15 @@ complex_value_schema
     ;
 
 set_schema
-    : 'Set' '(' (primitive_value_schema '?'? | set_schema) ')'
+    : 'Set' '(' (primitive_value_schema 'NULL'? | set_schema) ')'
     ;
 
 list_schema
-    : 'List' '(' (primitive_value_schema '?'? | list_schema) ')'
+    : 'List' '(' (primitive_value_schema 'NULL'? | list_schema) ')'
     ;
 
 struct_schema
-    : 'Struct' '(' (primitive_value_schema '?'? | struct_schema) ')'
+    : 'Struct' '(' (primitive_value_schema 'NULL'? | struct_schema) ')'
     ;
 
 edge_schema

diff --git a/yarspg/examples/test-example.yarspg b/yarspg/examples/test-example.yarspg
@@ -43,9 +43,9 @@ S{"3432f2"}["set": Set(Set(String))]
 <"3z2">{"3432f2"}["set": {{"set2", "title"}, {"set3", "title3"}}]
 S{"1ad32"}["list": List(String)]
 <"1dsc">{"1ad32"}["list": ["name55", "name3"]]
-S{"1ad32"}["list": List(String?)]
+S{"1ad32"}["list": List(String NULL)]
 <"1dsc">{"1ad32"}["list": ["name55", null]]
-S{"1ad32"}["list": List(String)?]
+S{"1ad32"}["list": List(String) NULL]
 <"1dsc">{"1ad32"}["list": null]
 S{"ad3"}["list": List(List(String))]
 <"ds">{"ad3"}["list": [["name55", "name3"]]]
@@ -73,8 +73,8 @@ S("a1d")-{"aaa1a"}["key": String ID, "aab2bc": List(Integer)]->("label333")
 ("a")-<"id341">{"aaa2a"}->("c")
 S("label1")-{"bbb23b"}-("ef22")
 ("b43b")-{"bbb23b"}-("e")
-S("label1")-{"bbb23b"}["bbbd32d": Bool, "value": String?]-("ef22")
-S("label1")-{"bbb23b"}["bbbd32d": Bool ID, "value": String?]-("ef22")
+S("label1")-{"bbb23b"}["bbbd32d": Bool, "value": String NULL]-("ef22")
+S("label1")-{"bbb23b"}["bbbd32d": Bool ID, "value": String NULL]-("ef22")
 ("b43b")-{"bbbb53b"}["bbbd32d": false, "value": null]-("e")+foaf:maker: "Łukasz Szeremeta and Dominik Tomaszuk", <http://xmlns.com/dc/0.5/zyz>: "Test annotation"
 
 S("A")-{"label"}["date": Date]->("Z")