[NO ISSUE][BAD] Bring the BAD Branch to master
1. Updated paramList in lang.txt to use TypeExpression
2. Updated RequestParameters
3. Updated test results
Change-Id: I6f71319d7c9761266325e3641e0f796dd68408f4
diff --git a/asterix-bad/src/main/resources/lang-extension/lang.txt b/asterix-bad/src/main/resources/lang-extension/lang.txt
index 3cc4b7b..59e1a8d 100644
--- a/asterix-bad/src/main/resources/lang-extension/lang.txt
+++ b/asterix-bad/src/main/resources/lang-extension/lang.txt
@@ -120,7 +120,7 @@
{
FunctionName fctName = null;
FunctionSignature signature;
- List<Pair<VarIdentifier,IndexedTypeExpression>> paramList = new ArrayList<Pair<VarIdentifier,IndexedTypeExpression>>();
+ List<Pair<VarIdentifier,TypeExpression>> paramList = new ArrayList<Pair<VarIdentifier,TypeExpression>>();
List<Integer> paramIds = new ArrayList<Integer>();
String functionBody;
Token beginPos;
@@ -138,7 +138,7 @@
paramList = FunctionParameters()
<LEFTBRACE>
{
- for (Pair<VarIdentifier,IndexedTypeExpression> param : paramList)
+ for (Pair<VarIdentifier,TypeExpression> param : paramList)
{
VarIdentifier v = new VarIdentifier(param.getFirst().toString());
getCurrentScope().addNewVarSymbolToScope(v);
@@ -157,7 +157,7 @@
("period" period = FunctionCallExpr())?
{
List<VarIdentifier> paramListVariablesOnly = new ArrayList<VarIdentifier>();
- for(Pair<VarIdentifier,IndexedTypeExpression> p: paramList){
+ for(Pair<VarIdentifier,TypeExpression> p: paramList){
paramListVariablesOnly.add(p.first);
}
return new CreateProcedureStatement(signature, paramListVariablesOnly, paramIds, functionBody, period);