Changeset f881d47 in nscp

Timestamp:

08/11/11 08:40:57 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

39c73cd

Parents:

b8c44b4

Message:

Fixed some linux issues and readded grammar as it works on non-virtual-machine (memory issues?)

Files:

• include/parsers/where/grammar/grammar.cpp (modified) (1 diff)
• modules/PythonScript/script_wrapper.cpp (modified) (1 diff)

include/parsers/where/grammar/grammar.cpp

@@ -124 +124 @@
       cond_expr
           = (identifier_expr >> op >> identifier_expr)    [_val = build_e(_1, _2, _3) ]
-//          | (identifier_expr >> ascii::no_case["not in"] 
-//            >> '(' >> value_list >> ')')          [_val = build_e(_1, op_nin, _2) ]
-//          | (identifier_expr >> ascii::no_case["in"] 
-//            >> '(' >> value_list >> ')')          [_val = build_e(_1, op_in, _2) ]
-//            | ('(' >> expression >> ')')          [_val = _1 ]
+          | (identifier_expr >> ascii::no_case["not in"] 
+            >> '(' >> value_list >> ')')          [_val = build_e(_1, op_nin, _2) ]
+          | (identifier_expr >> ascii::no_case["in"] 
+            >> '(' >> value_list >> ')')          [_val = build_e(_1, op_in, _2) ]
+            | ('(' >> expression >> ')')          [_val = _1 ]
           ;
 
       identifier_expr
-          = identifier                    [_val = _1 ]
-//          = (identifier >> bitop >> identifier)       [_val = build_e(_1, _2, _3) ]
-//          | ('(' >> identifier >> bitop >> identifier >> ')') [_val = build_e(_1, _2, _3) ]
-//          | identifier                    [_val = _1 ]
+          = (identifier >> bitop >> identifier)       [_val = build_e(_1, _2, _3) ]
+          | ('(' >> identifier >> bitop >> identifier >> ')') [_val = build_e(_1, _2, _3) ]
+          | identifier                    [_val = _1 ]
           ;
 
       identifier 
           = "str" >> string_literal_ex            [_val = build_is(_1)]
-//          | (variable_name >> '(' >> list_expr >> ')')    [_val = build_if(_1, _2)]
+          | (variable_name >> '(' >> list_expr >> ')')    [_val = build_if(_1, _2)]
           | variable_name                   [_val = build_iv(_1)]
           | string_literal                  [_val = build_is(_1)]

modules/PythonScript/script_wrapper.cpp

@@ -1 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 
 #include <strEx.h>