Fix transform syntax errors

anz-bank · Sep 2, 2019 · b862104 · b862104
1 parent 80f09b3
commit b862104
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -13,6 +13,9 @@ gotools: gotools/todos
 .PHONY: generate
 generate: generate/todos
 
+.PHONY: validate
+validate: validate/todos
+
 .PHONY: compile
 compile: todos_client/todos todos_server/todos
 
@@ -26,6 +29,7 @@ GRAMMAR = grammars/go.gen.g
 TYPES_TRANSFORM_INPUT = $(TYPES_TRANSFORM) $(GRAMMAR)
 
 gen = $(SYSLGEN) gen --root-model . --root-transform . --transform $(1) --model examples/$(2).sysl --grammar $(GRAMMAR) --start goFile --outdir $(2)
+validate = $(SYSLGEN) validate --grammar $(GRAMMAR) --start goFile --root-transform . --transform $(1)
 
 clean/%:
 	-rm $*_client/$*-client
@@ -52,3 +56,10 @@ generate/%:
 	$(call gen,$(INTERFACE_TRANSFORM),$*)
 	$(call gen,$(HANDLER_TRANSFORM),$*)
 	$(call gen,$(ROUTER_TRANSFORM),$*)
+
+validate/%:
+	$(call validate,$(TYPES_TRANSFORM),$*)
+	$(call validate,$(CLIENT_TRANSFORM),$*)
+	$(call validate,$(INTERFACE_TRANSFORM),$*)
+	$(call validate,$(HANDLER_TRANSFORM),$*)
+	$(call validate,$(ROUTER_TRANSFORM),$*)
diff --git a/transforms/svc_client.sysl b/transforms/svc_client.sysl
@@ -82,7 +82,7 @@ CodeGenTransform:
       )
     )
 
-  !view makeValueExpr(strValue <: string) -> Expression:
+  !view makeValueExpr(strValue <: string) -> FuncArgsRest:
     strValue -> (:
       Expression = strValue -> <Expression>(:
         ValueExpr = strValue
@@ -106,7 +106,7 @@ CodeGenTransform:
       )
     )
 
-  !view makeFunctionCall(funcName <: string, arg0 <: Expression, rest <: sequence of Expression) -> Expression:
+  !view makeFunctionCall(funcName <: string, arg0 <: Expression, rest <: sequence of Expression) -> FuncArgsRest:
     funcName -> (:
       Expression = funcName -> <Expression>(:
         FunctionCall = funcName -> <FunctionCall>(:
@@ -141,10 +141,10 @@ CodeGenTransform:
         DeclareAndAssignStmt = ep -> <DeclareAndAssignStmt> (:
           Variables = "u, err"
           let sprintfArg = formatArgs(ep).formatArgs
-          let params = ep.value.pathvars -> <string> (:
+          let params = ep.value.pathvars -> <FuncArgsRest> (:
             Expression =  makeValueExpr(.name).Expression
           )
-          let getArgExpr = ep -> <Expression> (:
+          let getArgExpr = ep -> <FuncArgsRest> (:
             Expression = makeGetArgExpr("s", "url")
           )
           let restArg = [getArgExpr] | params
@@ -159,19 +159,19 @@ CodeGenTransform:
       Statement = ep -> <Statement> (:
         ReturnStmt = ep -> <ReturnStmt> (:
 
-          let body = ep.value.params where("body" in .attrs.patterns) -> <Expression> (:
+          let body = ep.value.params where("body" in .attrs.patterns) -> <FuncArgsRest> (:
             Expression = makeValueExpr(ToLower(Join(Split(.name, "_"), ""))).Expression
           )
 
-          let nilExpr = ep -> <Expression> (:
+          let nilExpr = ep -> <FuncArgsRest> (:
             Expression = makeValueExpr("nil").Expression
           )
 
           let body2 = if body count == 0 then [nilExpr] else body
-          let functionZeroExpr = ep -> <Expression>(:
+          let functionZeroExpr = ep -> <FuncArgsRest>(:
             Expression = makeFunctionZero("u.String")
           )
-          let getArgExpr = ep -> <Expression> (:
+          let getArgExpr = ep -> <FuncArgsRest> (:
             Expression = makeGetArgExpr("s", "client")
           )
           let restofArgs = [getArgExpr, makeValueExpr('"' + ep.value.method + '"'), functionZeroExpr] | body2 | [makeValueExpr("headers"), makeValueExpr("required") , makeValueExpr("responses")]
@@ -187,13 +187,13 @@ CodeGenTransform:
         DeclareAndAssignStmt = ep -> <DeclareAndAssignStmt> (:
           Variables = "resp, err"
           let args = buildSprintfCall(ep)
-          let params = ep.value.pathvars -> <string> (:
+          let params = ep.value.pathvars -> <FuncArgsRest> (:
             Expression =  makeValueExpr(.name).Expression
           )
-          let getArgExprUrl = ep -> <Expression> (:
+          let getArgExprUrl = ep -> <FuncArgsRest> (:
             Expression = makeGetArgExpr("s", "url")
           )
-          let getArgExprClient = ep -> <Expression> (:
+          let getArgExprClient = ep -> <FuncArgsRest> (:
             Expression = makeGetArgExpr("s", "client")
           )
           let restArg = [getArgExprUrl] | params
@@ -371,7 +371,7 @@ CodeGenTransform:
             TypeName = "context.Context"
           )
 
-          let httpHeader = ep -> <ParameterDecl>(:
+          let httpHeader = ep -> <ParameterList>(:
             ParameterDecl = ep -> <ParameterDecl>(:
               Identifier = "headers"
               TypeName = "map[string]string"

diff --git a/transforms/svc_handler.sysl b/transforms/svc_handler.sysl
@@ -56,7 +56,7 @@ CodeGenTransform:
         IfElseStmt = condition -> <IfElseStmt> (:
           Expression = makeValueExpr(condition)
           Block = condition -> <Block> (:
-            let interfaceCall = condition -> <Statement> (:
+            let interfaceCall = condition -> <StatementList> (:
               Statement = condition -> <Statement> (:
                 DeclareAndAssignStmt = condition -> <DeclareAndAssignStmt> (:
                   Variables = "errResp"
@@ -65,10 +65,10 @@ CodeGenTransform:
                       FunctionName = "s.serviceInterface.GetErrorResponse"
                       FunctionArgs = condition -> <FunctionArgs> (:
                         Expression = makeValueExpr(errorCode)
-                        let errMsgExpr = condition -> <Expression> (:
+                        let errMsgExpr = condition -> <FuncArgsRest> (:
                           Expression = makeValueExpr(errorMsg)
                         )
-                        let errObjExpr = condition -> <Expression> (:
+                        let errObjExpr = condition -> <FuncArgsRest> (:
                           Expression = makeValueExpr(errorObj)
                         )
                         FuncArgsRest = [errMsgExpr, errObjExpr]
@@ -78,16 +78,16 @@ CodeGenTransform:
                 )
               )
             )
-            let sendResp = condition -><Statement> (:
+            let sendResp = condition -><StatementList> (:
               Statement = condition -><Statement> (:
                 FunctionCall = condition -> <ReturnStmt> (:
                   FunctionName = "restlib.SendHTTPResponse"
                   FunctionArgs = condition -> <FunctionArgs> (:
                     Expression = makeValueExpr("w")
-                    let badRequestExpr = condition -> <Expression> (:
+                    let badRequestExpr = condition -> <FuncArgsRest> (:
                       Expression = makeValueExpr("http.StatusBadRequest")
                     )
-                    let errRespExpr = condition -> <Expression> (:
+                    let errRespExpr = condition -> <FuncArgsRest> (:
                       Expression = makeValueExpr("errResp")
                     )
                     FuncArgsRest = [badRequestExpr, errRespExpr]
@@ -96,7 +96,7 @@ CodeGenTransform:
               )
             )
 
-            let returnStmt = condition -> <Statement> (:
+            let returnStmt = condition -> <StatementList> (:
               Statement = condition -> <Statement> (:
                 ReturnStmt = condition -> <ReturnStmt> (:
                   PayLoad = ""
@@ -330,7 +330,7 @@ CodeGenTransform:
 
         Block = ep -> <Block>(:
 
-          let implCall = ep -> <Statement> (:
+          let implCall = ep -> <StatementList> (:
             Statement = ep -> <Statement> (:
               DeclareAndAssignStmt = ep -> <DeclareAndAssignStmt> (:
                 Variables = returnValues
@@ -346,7 +346,7 @@ CodeGenTransform:
             )
           )
 
-          let setHeadersCall = ep -> <Statement> (:
+          let setHeadersCall = ep -> <StatementList> (:
             Statement = ep -> <Statement> (:
               FunctionCall = ep -> <FunctionCall> (:
                 FunctionName = "restlib.SetHeaders"
@@ -360,7 +360,7 @@ CodeGenTransform:
             )
           )
 
-          let sendRespCall = ep -> <Statement> (:
+          let sendRespCall = ep -> <StatementList> (:
             Statement = ep -> <Statement> (:
               FunctionCall = ep -> <FunctionCall> (:
                 FunctionName = "restlib.SendHTTPResponse"

diff --git a/transforms/svc_interface.sysl b/transforms/svc_interface.sysl
@@ -58,7 +58,7 @@ CodeGenTransform:
       methodName = GoName(method + Join(methodPostfix flatten(.out), "")).out
     )
 
-  !view panicBlock(methodName <: string) -> StatementList:
+  !view panicBlock(methodName <: string) -> Block:
     methodName -> (:
       StatementList = [methodName] -> <StatementList> (:
         Statement = methodName -> <Statement> (: