commit fc1278ced0228adbeccea508bb98e52275302735
author Sapan Bhatia <gwsapan@gmail.com> Mon Jul 17 12:57:13 2017 -0400
committer Sapan Bhatia <gwsapan@gmail.com> Mon Jul 17 12:57:13 2017 -0400
tree 3cc964edbd7b4c72768f961f219b457e315796d8
parent bc6268ca9a71fe881e0fbb5d8128d91e2da771ac

Added support for string and numeric constants

plyxproto/logicparser.py

diff --git a/plyxproto/logicparser.py b/plyxproto/logicparser.py
index 7f67459..4af0cb6 100644
--- a/plyxproto/logicparser.py
+++ b/plyxproto/logicparser.py
@@ -11,7 +11,7 @@
 class FOLLexer(object):
     keywords = ('forall', 'exists', 'True', 'False', 'not')
 
-    tokens = ['ESCAPE', 'COLON', 'IMPLIES', 'OR', 'AND', 'LPAREN', 'RPAREN', 'EQUALS', 'SYMBOL', 'LT', 'RT'] + [k.upper() for k in keywords]
+    tokens = ['STRING_LITERAL', 'NUM', 'ESCAPE', 'COLON', 'IMPLIES', 'OR', 'AND', 'LPAREN', 'RPAREN', 'EQUALS', 'SYMBOL', 'LT', 'RT'] + [k.upper() for k in keywords]
     # literals = '()+-*/=?:,.^|&~!=[]{};<>@%'
 
     t_ignore_LINE_COMMENT = '//.*'
@@ -23,6 +23,8 @@
     t_AND = '\\&'
     t_LPAREN = '\\('
     t_RPAREN = '\\)'
+    t_NUM = r'[+-]?\d+(\.\d+)?'
+    t_STRING_LITERAL = r'\"([^\\\n]|(\\.))*?\"'
 
     t_EQUALS = '\\='
 
@@ -65,7 +67,15 @@
         self.offset = of
         self.lh.offset = of
 
-    def p_term_constant(self, p):
+    def p_term_numeric_constant(self, p):
+        '''term : NUM'''
+        p[0] = p[1]
+
+    def p_term_string_constant(self, p):
+        '''term : STRING_LITERAL'''
+        p[0] = p[1]
+
+    def p_term_boolean_constant(self, p):
         '''term :   FALSE
                     | TRUE'''
         p[0] = p[1]