#12 , #11 - Add "-" to ID token. Add constants to Type Enum

bloxbean · Mar 18, 2021 · c710177 · c710177
1 parent 23ffefc
commit c710177
Show file tree

Hide file tree

Showing 44 changed files with 2,106 additions and 2,015 deletions.
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/_TEALLexer.java b/src/main/gen/com/bloxbean/algodea/idea/language/_TEALLexer.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/parser/TEALParser.java b/src/main/gen/com/bloxbean/algodea/idea/language/parser/TEALParser.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAddrParamImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAddrParamImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAddrStatementImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAddrStatementImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALArgOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALArgOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetHoldingGetOPImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetHoldingGetOPImpl.java
diff --git a/...ain/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetHoldingGetOperationImpl.java b/...ain/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetHoldingGetOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetParamsGetOpImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetParamsGetOpImpl.java
diff --git a/...main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetParamsGetOperationImpl.java b/...main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALAssetParamsGetOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBranchImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBranchImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBranchOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBranchOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALByteStatementImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALByteStatementImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBytecOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBytecOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBytecblockOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALBytecblockOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALFlowControlOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALFlowControlOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGeneralOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGeneralOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGlobalOpCodeImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGlobalOpCodeImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGlobalOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGlobalOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnLoadingOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnLoadingOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnOpcodeImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnOpcodeImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnaLoadingOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnaLoadingOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnaOpcodeImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALGtxnaOpcodeImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALIntStatementImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALIntStatementImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALIntcOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALIntcOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALIntcblockOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALIntcblockOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALLoadOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALLoadOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALLoadingOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALLoadingOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALPragmaImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALPragmaImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALPragmaVersionImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALPragmaVersionImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALProgramImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALProgramImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALPseudoOpImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALPseudoOpImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALStateAccessOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALStateAccessOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALStatementImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALStatementImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALStoreOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALStoreOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALSubstringOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALSubstringOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnFieldArgImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnFieldArgImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnLoadingOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnLoadingOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnOpcodeImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnOpcodeImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnaLoadingOperationImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnaLoadingOperationImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnaOpcodeImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALTxnaOpcodeImpl.java
diff --git a/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALUnsignedIntegerImpl.java b/src/main/gen/com/bloxbean/algodea/idea/language/psi/impl/TEALUnsignedIntegerImpl.java
diff --git a/src/main/java/com/bloxbean/algodea/idea/language/TEAL.bnf b/src/main/java/com/bloxbean/algodea/idea/language/TEAL.bnf
@@ -80,7 +80,7 @@
     NAMED_INTEGER_CONSTANT = 'regexp:(NoOp|OptIn|CloseOut|ClearState|UpdateApplication|DeleteApplication)'
 
     //TypeEnum constants
-    TYPENUM_CONSTANT = 'regexp:(unknown|pay|keyreg|acfg|axfer|afrz|appl)'
+    TYPENUM_CONSTANT = 'regexp:(unknown|pay|keyreg|acfg|axfer|afrz|appl|Unknown|Payment|KeyRegistration|AssetConfig|AssetTransfer|AssetFreeze|ApplicationCall)'
 
     //Global Fields
     GLOBAL_FIELD        = 'regexp:(MinTxnFee|MinBalance|MaxTxnLife|ZeroAddress|GroupSize|LogicSigVersion|Round|LatestTimestamp|CurrentApplicationID)'
@@ -173,7 +173,7 @@ LoadingOperation ::=  intcblockOperation
                                   | 'intc_1'
                                   | 'intc_2'
                                   | 'intc_3'
-                                  
+
                                   | bytecblockOperation
                                   | bytecOperation
                                   | 'bytec_0'
@@ -277,4 +277,4 @@ assetParamsGetOperation ::=  assetParamsGetOp (unsignedInteger | ASSET_PARAMS_GE
 assetHoldingGetOP    ::= 'asset_holding_get'
 assetParamsGetOp     ::= 'asset_params_get'
 
-unsignedInteger ::= l_integer {name="uint8"}
+unsignedInteger ::= l_integer {name="uint8"}
diff --git a/src/main/java/com/bloxbean/algodea/idea/language/_TEALLexer.flex b/src/main/java/com/bloxbean/algodea/idea/language/_TEALLexer.flex
@@ -36,14 +36,14 @@ FLOWCONTROL_OP=(err|return|pop|dup|dup2|bnz|bz|b)
 STATEACCESS_OP=(balance|app_opted_in|app_local_get|app_local_get_ex|app_global_get|app_global_get_ex|app_local_put|app_global_put|app_local_del|app_global_del|asset_holding_get|asset_params_get)
 TXN_LOADING_OP=(txn|gtxn|txna|gtxna)
 NAMED_INTEGER_CONSTANT=(NoOp|OptIn|CloseOut|ClearState|UpdateApplication|DeleteApplication)
-TYPENUM_CONSTANT=(unknown|pay|keyreg|acfg|axfer|afrz|appl)
+TYPENUM_CONSTANT=(unknown|pay|keyreg|acfg|axfer|afrz|appl|Unknown|Payment|KeyRegistration|AssetConfig|AssetTransfer|AssetFreeze|ApplicationCall)
 GLOBAL_FIELD=(MinTxnFee|MinBalance|MaxTxnLife|ZeroAddress|GroupSize|LogicSigVersion|Round|LatestTimestamp|CurrentApplicationID)
 ASSET_HOLDING_GET_FIELD=(AssetBalance|AssetFrozen)
 ASSET_PARAMS_GET_FIELD=(AssetTotal|AssetDecimals|AssetDefaultFrozen|AssetUnitName|AssetName|AssetURL|AssetMetadataHash|AssetManager|AssetReserve|AssetFreeze|AssetClawback)
 OCTAL=(0)[0-9]+
 HEX=(0x|0X)[a-fA-F0-9]*
 VAR_TMPL=(VAR_TMPL_)([a-zA-Z0-9_$.#@~?]+)
-ID=([a-zA-Z0-9_$.#@~?]+[a-zA-Z0-9_$.#@~?]*)
+ID=([a-zA-Z0-9_$.#@~?]+[a-zA-Z0-9_$.#@~?-]*)
 BASE32=([A-Z2-7]{8})*([A-Z2-7]{2}={6}|[A-Z2-7]{4}={4}|[A-Z2-7]{5}={3}|[A-Z2-7]{7}=)?
 BASE64=[-A-Za-z0-9+=]{1,50}|=[^=]|={3}
 

diff --git a/src/main/java/com/bloxbean/algodea/idea/language/readme.md b/src/main/java/com/bloxbean/algodea/idea/language/readme.md
@@ -0,0 +1,5 @@
+# Generate Parser and Lexer
+
+- Right click on TEAL.bnf > Generate Parser
+
+- Right click on _TEALLexer.flex > Run JFlex Generator