Fixes plus small test for analyze grammar.

Author: F Saad

src/metamodels/cgpm_analyze/analyze_grammar.y

@@ -24,12 +24,12 @@
 
 anlaysis(start)     ::= phrases(ps).
 
-phrases(none)       ::= .
 phrases(one)        ::= phrase(p).
 phrases(many)       ::= phrases(ps) T_SEMI phrase(p).
 
 phrase(variables)   ::= K_VARIABLES column_list(cols).
 phrase(skip)        ::= K_SKIP column_list(cols).
+phrase(none)        ::= .
 
 column_list(one)    ::= column_name(col).
 column_list(many)   ::= column_list(cols) T_COMMA column_name(col).

src/metamodels/cgpm_analyze/analyze_parse.py

@@ -35,8 +35,6 @@
 }
 
 PUNCTUATION = {
-    '(': analyze_grammar.T_LROUND,
-    ')': analyze_grammar.T_RROUND,
     ',': analyze_grammar.T_COMMA,
     ';': analyze_grammar.T_SEMI,
 }
@@ -91,7 +89,6 @@ def syntax_error(self, (token, text)):
 
     def p_anlaysis_start(self, ps):             self.phrases = ps
 
-    def p_phrases_none(self):                   return []
     def p_phrases_one(self, p):                 return [p]
     def p_phrases_many(self, ps, p):
         if p: ps.append(p)
@@ -107,3 +104,11 @@ def p_column_name_n(self, name):            return name
 
 Variables = namedtuple('Variables', ['vars',])
 Skip = namedtuple('Skip', ['vars',])
+
+if __name__ == '__main__':
+    # VARIABLES a, b,c, d;
+    tokens = [
+        'SKIP', 'a', ',', 'b', ';',
+        'VARIABLES', 'a', ',', 'b', ';',
+        'SKIP', 'a', ';']
+    print parse(tokens)