commit f18c14b0925c187cdab09475819b790d54d7cb49
author ramangrover29@gmail.com <ramangrover29@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> Wed Apr 10 16:26:57 2013 +0000
committer ramangrover29@gmail.com <ramangrover29@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> Wed Apr 10 16:26:57 2013 +0000
tree 35b7e7e0ba7340705bb7fd4fb12dc79cdf5ba367
parent cf57b686ee1f5ffa5a25ed2d765c510d2f8210bd

Code review by Sattam
Fix for isse 314: Semicolons treated finicky-ily in CREATE FUNCTION


git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1708 eaa15691-b419-025a-1212-ee371bd00084

asterix-aql/src/main/javacc/AQL.jj

diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index 8e3e203..be7d954 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -1371,7 +1371,7 @@
       getCurrentScope().addNewVarSymbolToScope(var);
       arity++;
     })*)? <RIGHTPAREN> "{" funcBody = Expression() "}"
-
+    (";")?
     {
       signature = new FunctionSignature(defaultDataverse, functionName, arity);
       getCurrentScope().addFunctionDescriptor(signature, false);
@@ -1428,11 +1428,12 @@
           beginPos = getToken(0);
           } 
           functionBodyExpr = Expression() 
-          "}"
+          "}" 
           {
             endPos = getToken(0);
             functionBody = extractFragment(beginPos.beginLine, beginPos.beginColumn, endPos.beginLine, endPos.beginColumn);
           }
+          (";")?
     {
       signature = new FunctionSignature(dataverse, functionName, paramList.size());
       getCurrentScope().addFunctionDescriptor(signature, false);