framework for typechecking and code generation

[ccc.git] / ast.c

diff --git a/ast.c b/ast.c
index 372234e..29141e4 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -66,7 +66,7 @@ struct stmt *stmt_assign(char *ident, struct list *fields, struct expr *expr)
        res->type = sassign;
        res->data.sassign.ident = ident;
        res->data.sassign.fields = (char **)
-               list_to_array(fields, &res->data.sassign.nfield, true);
+               list_to_array(fields, &res->data.sassign.nfields, true);
        res->data.sassign.expr = expr;
        return res;
 }
@@ -212,13 +212,13 @@ struct expr *expr_string(char *str)
 {
        struct expr *res = safe_malloc(sizeof(struct expr));
        res->type = estring;
-       res->data.estring.nchar = 0;
+       res->data.estring.nchars = 0;
        res->data.estring.chars = safe_malloc(strlen(str)+1);
        char *p = res->data.estring.chars;
        while(*str != '\0') {
                str = unescape_char(str);
                *p++ = *str++;
-               res->data.estring.nchar++;
+               res->data.estring.nchars++;
        }
        *p = '\0';
        return res;
@@ -349,7 +349,7 @@ void stmt_print(struct stmt *stmt, int indent, FILE *out)
        case sassign:
                pindent(indent, out);
                fprintf(out, "%s", stmt->data.sassign.ident);
-               for (int i = 0; i<stmt->data.sassign.nfield; i++)
+               for (int i = 0; i<stmt->data.sassign.nfields; i++)
                        fprintf(out, ".%s", stmt->data.sassign.fields[i]);
                safe_fprintf(out, " = ");
                expr_print(stmt->data.sassign.expr, out);
@@ -452,7 +452,7 @@ void expr_print(struct expr *expr, FILE *out)
                break;
        case estring:
                safe_fprintf(out, "\"");
-               for (int i = 0; i<expr->data.estring.nchar; i++)
+               for (int i = 0; i<expr->data.estring.nchars; i++)
                        safe_fprintf(out, "%s", escape_char(
                                expr->data.estring.chars[i], buf, true));
                safe_fprintf(out, "\"");
@@ -547,7 +547,7 @@ void stmt_free(struct stmt *stmt)
        switch(stmt->type) {
        case sassign:
                free(stmt->data.sassign.ident);
-               for (int i = 0; i<stmt->data.sassign.nfield; i++)
+               for (int i = 0; i<stmt->data.sassign.nfields; i++)
                        free(stmt->data.sassign.fields[i]);
                free(stmt->data.sassign.fields);
                expr_free(stmt->data.sassign.expr);