Commits

Pierre Carbonnelle committed 8a34425

update grammar documentation. Remove windows distribution.

Comments (0)

Files changed (3)

 del *.*
 cd "C:\Users\pcarbonn\Documents\98 Eclipse\pyDatalog"
 Setup.py sdist
-Setup.py bdist_wininst
+rem Setup.py bdist_wininst
 pause

pyDatalog/grammar.txt

 
 body ::= ( '~' '(' body ')' | 
            | literal 
-           | '(' (variable | function) ('<' | '<=' | '==' | '~=' | '>='  | '>' | 'in' | 'not in' ) expression ')'
+           | '(' (variable | function) ( ('<' | '<=' | '==' | '~=' | '>='  | '>' ) expression 
+                                       | ('._in' | '._not_in') '(' expression ')'
+                                       ) ')'
            ) 
          ( '&' ( '~' '(' body ')' |
            | literal 
-           | '(' (variable | function) ('<' | '<=' | '==' | '~=' | '>='  | '>' | 'in' | 'not in' ) expression ')'
-           ) 
+           | '(' (variable | function) ( ('<' | '<=' | '==' | '~=' | '>='  | '>' ) expression
+                                       | ('._in' | '._not_in') '(' expression ')'
+                                       ) ')'
+           )  
          )*
 
 head_function ::= predicate '[' (constant|variable)(',' (constant|variable))*   ']'
 
 head ::= literal 
       | '(' head_function  '==' (variable | constant) ')'
-      | '(' head_function '==' ('len' | 'sum' | 'concat' | 'min' | 'max' | 'rank' | 'running_sum' ) '(' arguments ')' ')'
+      | '(' head_function '==' ('_len' | '_sum' | '_min' | '_max' | 'concat' | 'rank' | 'running_sum' ) '(' arguments ')' ')'
 
 fact ::= ( predicate '(' (  constant (',' constant)*  )? ')' | predicate '[' constant (',' constant )*   ']' '==' constant )
 
 cd "C:\Users\pcarbonn\Documents\98 Eclipse\pyDatalog\build\lib"
 del *.*
 cd "C:\Users\pcarbonn\Documents\98 Eclipse\pyDatalog"
-setup.py register sdist bdist_wininst upload
+setup.py register sdist upload
 pause