edits in bobc, parser returns none, really?

Author: mastergreg

Diff for: bobc.py

@@ -4,59 +4,27 @@
 #* -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 # File Name : bobc.py
 # Creation Date : 29-03-2012
-# Last Modified : Thu 10 May 2012 08:24:51 PM EEST
+# Last Modified : Fri 11 May 2012 11:32:47 AM EEST
 #_._._._._._._._._._._._._._._._._._._._._.*/
 from lexer import lexer
 from parser import parser
 from prules import perrors
 from tokrules import terrors
-import readline
-from sys import argv,stderr
-from tree import node
-from getopt import gnu_getopt
-from string import replace as sreplace
-
-def find_column(inp,token):
-    last_cr = inp.rfind('\n',0,token.lexpos)
-    if last_cr < 0:
-        last_cr = 0
-    column = (token.lexpos - last_cr) + 1
-    return column
 
-def get_error_line_with_color(inp,token):
-    last_cr = inp.rfind('\n',0,token.lexpos)
-    next_cr = inp.find('\n',token.lexpos)
-    if last_cr < 0:
-        last_cr = 0
-    line = inp[last_cr+1:next_cr]
-    for i in range(len(line)):
-        if ord(line[i]) == 9:
-            continue
-        else:
-            break
-    line = sreplace(line[i:],token.value,'\033[4;32m'+token.value+'\033[0m')
-    return line
+from sys import argv
+from getopt import gnu_getopt
 
-def print_errors(merrors,data,filename='stdin'):
-    '''prints the errors returned by the parser'''
-    if merrors:
-        for p in merrors:
-            text = get_error_line_with_color(data,p)
-            pline = p.lineno
-            pcolumn = find_column(data,p)
-            stderr.write("{0}:{1}:{2}  syntax error: '{3}'\n".format(filename,pline,pcolumn,text,p))
-            exit(-1)
-        return False
-    else:
-        return True
+from error_handler import find_column, get_error_line_with_color, print_errors
 
-
-
 def main():
     if len(argv) > 1:
         #get command line arguements
-        switches,args = gnu_getopt(argv[1:],':o:')
-        switches = dict(switches)
+        switches = {'-o':'a.xml'}
+        setswitches,args = gnu_getopt(argv[1:],':o:')
+        setswitches = dict(setswitches)
+
+        for i in setswitches.keys():
+            switches[i] = setswitches[i]
 
         filename = args[0]
 

Diff for: parser.py

@@ -4,19 +4,11 @@
 #* -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 # File Name : parser.py
 # Creation Date : 21-03-2012
-# Last Modified : Thu 10 May 2012 07:32:48 PM EEST
+# Last Modified : Fri 11 May 2012 11:22:37 AM EEST
 #_._._._._._._._._._._._._._._._._._._._._.*/
 
-# Build the lexer
 from tokrules import tokens
 from prules import *
 import ply.yacc as yacc
 
-#def p_error(p):
-#    print("Syntax error at '%s'" % p.value)
-
 parser = yacc.yacc()
-
-if __name__ == "__main__":
-    main()
-

Diff for: prules.py

@@ -1,10 +1,9 @@
-#!/usr/bin/env python
-# -*- coding: utf-8
+#!/usr/bin/env python # -*- coding: utf-8
 #
 #* -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 # File Name : parserules.py
 # Creation Date : 02-04-2012
-# Last Modified : Fri 11 May 2012 01:23:07 AM EEST
+# Last Modified : Fri 11 May 2012 11:57:49 AM EEST
 #_._._._._._._._._._._._._._._._._._._._._.*/
 
 from tokrules import *
@@ -27,25 +26,14 @@
                 ('left','+','-'),
                 ('left','*','/','%'),
                 ('nonassoc','UNAR','Size'),
-                ('nonassoc','[',']','(',')')
+                ('right','[',']','(',')')
             )
 
 start = 'program'
 
 
 def gen_p_out(ptype,p,symbol=None):
-    #r = 'nili'
-    #try:
-    #    for i in p:
-    #        if type(i) == str:
-    #            try:
-    #                r.add(node(i,{'name':i}))
-    #            except AttributeError:
-    #                r = node(p[0],{'name':p[0]})
-    #            print i,r
-    #except TypeError:
-    #    return None
-
+    print p
     children = []
     for i in p[1:]:
         children.append(i)
@@ -84,10 +72,9 @@ def     : var_def ';'
 def p_type(p):
     '''
     type    :   simple_type
-            |   simple_type '[' ']'
+            |   simple_type '[' ']' 
     '''
     p[0] = gen_p_out('type',p)
-    #pass
 
 
 
@@ -96,71 +83,83 @@ def p_ret_type(p):
     ret_type    : Void
                 | type
     '''
-    pass
+    p[0] = gen_p_out('ret_type',p)
 
 def p_simple_type(p):
     '''
     simple_type : Bool
                 | Int 
                 | Char
     '''
-    pass    
+    p[0] = gen_p_out('ret_type',p)
 
 def p_var_def(p):
     '''
     var_def     : type Id
                 | type Id ASSIGN expr
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 def p_func_def(p):
     '''
     func_def    : ret_type Id '(' ')' block
                 | ret_type Id '(' formal_params ')' block
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 def p_formal_params(p):
     '''
     formal_params   : type Id rep_formal_params
     '''
-    pass
+    p[0] = gen_p_out('formal_params',p)
 
-def p_rep_formal_params(p):
+
+def p_rep_formal_params_empty(p):
     '''
     rep_formal_params   : empty
-                        | ','  type Id rep_formal_params
     '''
     pass
 
+def p_rep_formal_params(p):
+    '''
+    rep_formal_params   : ','  type Id rep_formal_params
+    '''
+    p[0] = gen_p_out('formal_params',p)
+
+
 def p_actual_params(p):
     '''
     actual_params   : expr rep_actual_params
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
-def p_rep_actual_params(p):
+def p_rep_actual_params_empty(p):
     '''
     rep_actual_params   : empty
-                        | ',' expr rep_actual_params
     '''
     pass
 
+def p_rep_actual_params(p):
+    '''
+    rep_actual_params   : ',' expr rep_actual_params
+    '''
+    p[0] = gen_p_out('params',p)
+
 
 def p_block(p):
     '''
     block       : '{' '}'
                 | '{' stmt_list '}'
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 
 def p_stmtm_list(p):
     '''
     stmt_list   : stmt ';'
                 | stmt ';' stmt_list
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 def p_stmt(p):
     '''
@@ -169,12 +168,13 @@ def p_stmt(p):
             | If '(' expr ')'  stmt Else stmt
             | For '(' var_def ';' expr ';' stmt ')' stmt
             | While '(' expr ')' stmt
-            | expr
+            | expr ';'
             | block
-            | Delete Id
-            | Ret expr
+            | Delete expr ';'
+            | Ret expr ';'
+            | Ret ';'
     '''
-    pass
+    p[0] = gen_p_out('stmt',p)
 
 
 def p_expr_atom(p):
@@ -191,6 +191,7 @@ def p_expr_atom(p):
                 | Id '(' actual_params ')'
                 | Id ASSIGN expr
     '''
+    p[0] = gen_p_out('expr_atom',p)
 
 def p_expr(p):
     '''
@@ -211,7 +212,7 @@ def p_expr(p):
             | expr  '^'    expr
 
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 
 def p_un_op(p):
@@ -220,13 +221,13 @@ def p_un_op(p):
                 | '-' expr %prec UNAR
                 | '+' expr %prec UNAR
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 def p_lval(p):
     '''
     lval    : Id
             | Id '[' expr ']'
     '''
-    pass
+    p[0] = gen_p_out('Generic',p)
 
 

Diff for: sample/helloworld.bob

@@ -1,6 +1,9 @@
-print("hello world\n");
-print("hello world\n");
-print("hello world\n");
-print("hello world\n");
-print("hello world\n");
-print("hello world\n");
+void main()
+{
+    print("hello world\n");
+    print("hello world\n");
+    print("hello world\n");
+    print("hello world\n");
+    print("hello world\n");
+    print("hello world\n");
+}