5 files changed, 25 insertions, 44 deletions

diff --git a/abbrevs.txt b/abbrevs.txt
index 57d5361..f75f05b 100644
--- a/abbrevs.txt
+++ b/abbrevs.txt
@@ -3,8 +3,11 @@ ident - identifier
 direct - directive
 decl - declaration
 stmt - statement
+expr - expression
+op - operator
 tokr - tokenizer
 str - string
 num - number
 fn - function
+ptr - pointer
 eof - end of file
diff --git a/main.c b/main.c
index 9c62e6b..83b6541 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,5 @@
 /* 
 TODO:
-blocks anywhere
 pointers
 don't allow nested functions to capture outer variables (constants are allowed though)
 re-do cgen
diff --git a/parse.c b/parse.c
index d5c9e84..811e3e6 100644
--- a/parse.c
+++ b/parse.c
@@ -5,7 +5,8 @@ typedef enum {
 			  TYPE_BUILTIN,
 			  TYPE_FN,
 			  TYPE_TUPLE,
-			  TYPE_ARR /* e.g. [5]int */
+			  TYPE_ARR,
+			  TYPE_PTR
 } TypeKind;
 
 typedef enum {
@@ -42,6 +43,9 @@ typedef struct Type {
 				struct Expression *n_expr;
 			};
 		} arr;
+		struct {
+			struct Type *of;
+		} ptr;
 	};
 } Type;
 
@@ -304,6 +308,11 @@ static size_t type_to_str_(Type *t, char *buffer, size_t bufsize) {
 		written += str_copy(buffer + written, bufsize - written, ")");
 		return written;
 	}
+	case TYPE_PTR: {
+		size_t written = str_copy(buffer, bufsize, "*");
+		written += type_to_str_(t->ptr.of, buffer + written, bufsize - written);
+		return written;
+	}
 	}
 
 	assert(0);
@@ -494,6 +503,13 @@ static bool parse_type(Parser *p, Type *type) {
 				}
 			}
 			break;
+		case KW_ASTERISK:
+			/* pointer */
+			type->kind = TYPE_PTR;
+			type->ptr.of = err_malloc(sizeof *type->ptr.of); /* OPTIM */
+			t->token++;	/* move past * */
+			if (!parse_type(p, type->ptr.of)) return false;
+			break;
 		default:
 			tokr_err(t, "Unrecognized type.");
 			return false;
@@ -1174,47 +1190,7 @@ static void fprint_decl(FILE *out, Declaration *d);
 
 static void fprint_type(FILE *out, Type *t) {
 	PARSE_PRINT_LOCATION(t->where);
-	switch (t->kind) {
-	case TYPE_BUILTIN:
-		fprintf(out, "%s", keywords[builtin_type_to_kw(t->builtin)]);
-		break;
-	case TYPE_VOID:
-		fprintf(out, "void");
-		break;
-	case TYPE_UNKNOWN:
-		fprintf(out, "???");
-		break;
-	case TYPE_FN: {
-		Type *types = t->fn.types.data;
-		fprintf(out, "fn (");
-		for (size_t i = 1; i < t->fn.types.len; i++){ 
-			fprint_type(out, &types[i]);
-			fprintf(out, ",");
-		}
-		fprintf(out, ") ");
-		fprint_type(out, &types[0]);
-	} break;
-	case TYPE_TUPLE: {
-		fprintf(out, "(");
-		arr_foreach(&t->tuple, Type, child) {
-			if (child != t->tuple.data) {
-				fprintf(out, ", ");
-			}
-			fprint_type(out, child);
-		}
-		fprintf(out, ")");
-	} break;
-	case TYPE_ARR:
-		fprintf(out, "[");
-		if (t->flags & TYPE_FLAG_RESOLVED) {
-			fprintf(out, INTEGER_FMT, t->arr.n);
-		} else {
-			fprint_expr(out, t->arr.n_expr);
-		}
-		fprintf(out, "]");
-		fprint_type(out, t->arr.of);
-		break;
-	}
+	fprintf(out, "%s", type_to_str(t));
 }
 
 
diff --git a/test.toc b/test.toc
index 534c5a9..536f095 100644
--- a/test.toc
+++ b/test.toc
@@ -1,3 +1,4 @@
 main @= fn() {
-	 x := 7;
+	 x, y, z : *int;
+	 foo : *f32;
 };
diff --git a/types.c b/types.c
index 8d70850..e317fab 100644
--- a/types.c
+++ b/types.c
@@ -101,6 +101,8 @@ static bool type_eq(Type *a, Type *b) {
 	case TYPE_ARR:
 		if (a->arr.n != b->arr.n) return false;
 		return type_eq(a->arr.of, b->arr.of);
+	case TYPE_PTR:
+		return type_eq(a->ptr.of, b->ptr.of);
 	}
 	assert(0);
 	return false;