Changeset 1158 for XIOS/dev/dev_olga/src/parse_expr/yacc_parser.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/parse_expr/yacc_parser.hpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/parse_expr/yacc_parser.hpp

@@ -60 +60 @@
     LE = 270,
     GE = 271,
-    LEFT_PARENTHESIS = 272,
-    RIGHT_PARENTHESIS = 273,
-    END = 274,
-    NEG = 275
+    NE = 272,
+    LEFT_PARENTHESIS = 273,
+    RIGHT_PARENTHESIS = 274,
+    QUESTION_MARK = 275,
+    COLON = 276,
+    END = 277,
+    NEG = 278
   };
 #endif
@@ -78 +81 @@
   xios::IFilterExprNode* filterNode;
 
-#line 81 "yacc_parser.hpp" /* yacc.c:1909  */
+#line 84 "yacc_parser.hpp" /* yacc.c:1909  */
 };
 # define YYSTYPE_IS_TRIVIAL 1