| commit | d678090dae142edffb4ceb8c18203f55eb54c388 | [log] [tgz] |
|---|---|---|
| author | Raman Grover <ramangrover29@gmail.com> | Tue Sep 24 16:57:32 2013 +0530 |
| committer | Raman Grover <ramangrover29@gmail.com> | Tue Sep 24 16:57:32 2013 +0530 |
| tree | 8b0ebb031d832b81f470f1962c2089168e4e647f | |
| parent | b95a3b25e74a632241617586296d7f10a8300f02 [diff] |
merge from master, resolved all conflicts, compilation succesful
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj index 8b46dc2..2e1bc6b 100644 --- a/asterix-aql/src/main/javacc/AQL.jj +++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -1050,7 +1050,7 @@ boolean secondAfterDot = false; } { - first = Identifier() ( "." second = Identifier() + first = Identifier() ( <DOT> second = Identifier() { secondAfterDot = true; }