Extend numeric operations to constant operations

- Besides decNums and hexNums, characters are also valid
2021-12-30 23:27:30 +01:00
parent 764b2d17b9
commit 226873e71c
2 changed files with 24 additions and 19 deletions
@@ -5,9 +5,11 @@ variable       =@{ ASCII_ALPHA
                 ~ (ASCII_ALPHANUMERIC | " ")*
                 }

+char           =_{ "\"" ~ ANY ~ "\"" }
 decNum         =_{ ASCII_DIGIT+ }
 hexNum         =_{ "0x" ~ ASCII_HEX_DIGIT+ }
-num            = { hexNum | decNum }
+num            =_{ hexNum | decNum }
+constant       = { char | num }

 var            =@{ "var"    ~ spacing+ ~ variable }
 delvar         =@{ "delvar" ~ spacing+ ~ variable }
@@ -15,12 +17,12 @@ delvar         =@{ "delvar" ~ spacing+ ~ variable }
 point          =@{ "point"  ~ spacing+ ~ variable }
 pointm         =@{ "pointm" ~ spacing+ ~ variable }

-add            =@{ "add"    ~ spacing+ ~ num }
-addb           =@{ "addb"   ~ spacing+ ~ num }
+add            =@{ "add"    ~ spacing+ ~ constant }
+addb           =@{ "addb"   ~ spacing+ ~ constant }
 addv           =@{ "addv"   ~ spacing+ ~ variable }

-sub            =@{ "sub"    ~ spacing+ ~ num }
-subb           =@{ "subb"   ~ spacing+ ~ num }
+sub            =@{ "sub"    ~ spacing+ ~ constant }
+subb           =@{ "subb"   ~ spacing+ ~ constant }
 subv           =@{ "subv"   ~ spacing+ ~ variable }

 copy           =@{ "copy"   ~ spacing+ ~ variable }