improvements to type checker. Add a test for type casting. Fix up typ…

…ecasting code gen.
parrot · Jun 10, 2012 · 77b100b · 77b100b
1 parent 0681fe8
commit 77b100b
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 102 deletions.
diff --git a/src/decl.c b/src/decl.c
@@ -6,6 +6,11 @@
 #include "ast.h"
 
 
+void
+print_type(m1_decl *type) {
+    fprintf(stderr, "TYPE: [%s]\n", type->name);   
+}
+
 /*
 
 Find the declaration for type <typename>.

diff --git a/src/decl.h b/src/decl.h
@@ -47,6 +47,7 @@ typedef struct m1_decl {
 
 } m1_decl;
 
+extern void print_type(m1_decl *type);
 
 extern m1_decl *type_find_def(M1_compiler *, char *type);
 extern m1_decl *type_enter_struct(M1_compiler *comp, char *structname, struct m1_struct *structdef);

diff --git a/src/gencode.c b/src/gencode.c
@@ -1436,10 +1436,10 @@ gencode_cast(M1_compiler *comp, m1_castexpr *expr) {
 
     switch (expr->targettype) {
         case VAL_INT:
-            fprintf(OUT, "\tntoi\tI%d, %c%d, x\n", result.no, reg_chars[(int)reg.type], reg.no);
+            fprintf(OUT, "\tconvert_i_n\tI%d, %c%d, x\n", result.no, reg_chars[(int)reg.type], reg.no);
             break;
         case VAL_FLOAT:
-            fprintf(OUT, "\titon\tN%d, %c%d, x\n", result.no, reg_chars[(int)reg.type], reg.no);
+            fprintf(OUT, "\tconvert_n_i\tN%d, %c%d, x\n", result.no, reg_chars[(int)reg.type], reg.no);
             break;
         default:
             assert(0);

diff --git a/src/m1.l b/src/m1.l
@@ -182,7 +182,7 @@ FLOATNUM        {SIGN}?(({DIGITS}{DOT}{DIGIT}*|{DOT}{DIGITS})([eE]{SIGN}?{DIGITS
                                m1_decl     *decl = type_find_def(comp, yytext);
 
                                if (decl == NULL) { /* not found, so must be an identifier */
-                                  fprintf(stderr, "%s is a TK_IDENT\n", yytext);
+                                //  fprintf(stderr, "%s is a TK_IDENT\n", yytext);
                                   return TK_IDENT; 
                                }                            
                                else {
@@ -192,7 +192,7 @@ FLOATNUM        {SIGN}?(({DIGITS}{DOT}{DIGIT}*|{DOT}{DIGITS})([eE]{SIGN}?{DIGITS
                                }
                            }
                            else {
-                                fprintf(stderr, "%s is a TK_IDENT\n", yytext);
+                               // fprintf(stderr, "%s is a TK_IDENT\n", yytext);
                                return TK_IDENT;
                            }