Added keywords 'EndSelect' and 'EndTry'

Signed-off-by: D-a-n-i-l-o <D-a-n-i-l-o@users.noreply.github.com>
wonkey-coders · May 16, 2021 · 87223e6 · 87223e6
1 parent c9fab5d
commit 87223e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/wake/parser.wx b/src/wake/parser.wx
@@ -799,7 +799,7 @@ Class Parser
 				For Local decl:=Eachin decls
 					stmts.Push( New VarDeclStmtExpr( Cast<VarDecl>(decl),decl.srcpos,decl.endpos ) )
 				Next
-			Case "end","endif","wend","next","until","forever","else","elseif","setter","getter","case","default","catch"
+			Case "end","endif","endselect","endtry","wend","next","until","forever","else","elseif","setter","getter","case","default","catch"
 				Exit
 			Default
 				Try
@@ -1108,8 +1108,7 @@ Class Parser
 		Endif
 
 		Try
-			Parse( "end" )
-			CParse( "select" )
+			If CParse( "end" ) CParse( "select" ) Else Parse( "endselect" )
 			ParseEol()
 		Catch ex:ParseEx
 			SkipToNextLine()
@@ -1165,8 +1164,7 @@ Class Parser
 
 		Try
 
-			Parse( "end" )
-			CParse( "try" )
+			If CParse( "end" ) CParse( "try" ) Else Parse( "endtry" )
 			ParseEol()
 
 		Catch ex:ParseEx

diff --git a/src/wake/toker.wx b/src/wake/toker.wx
@@ -35,8 +35,8 @@ Function InitToker:Void()
 	keyWords+="While;Wend;"
 	keyWords+="Repeat;Until;Forever;"
 	keyWords+="For;To;Step;Next;"
-	keyWords+="Select;Case;Default;"
-	keyWords+="Try;Catch;Throw;Throwable;Variant;CString;WString;TypeInfo;Typeof;"
+	keyWords+="Select;Case;Default;EndSelect;"
+	keyWords+="Try;Catch;EndTry;Throw;Throwable;Variant;CString;WString;TypeInfo;Typeof;"
 	keyWords+="Return;Print;Static;Cast;"
 	keyWords+="Extension;Protocol;Finalize;Delete"