Add newline as token type and add skeleton for parser

Makefile

@@ -2,7 +2,7 @@
 
 CC	= tcc
 CFLAGS	= -Wall -Wunsupported -Wwrite-strings -b -g
-OBJ	= main.o token.o
+OBJ	= main.o token.o parse.o
 
 all: woody
 
@@ -11,6 +11,7 @@ woody: $(OBJ)
 
 main.o: main.c token.o
 token.o: token.c token.h
+parse.o: parse.c parse.h token.o
 
 clean:
 	rm -f woody $(OBJ)

main.c

@@ -52,6 +52,9 @@ test(void)
 		case OP:
 			printf("val: %c\n", token->val.op);
 			break;
+		case NEWLINE:
+			printf("val: <newline>\n");
+			break;
 		}
 	}
 }

parse.c

@@ -0,0 +1,18 @@
+#include <inttypes.h>
+#include <stdio.h>
+#include "token.h"
+#include "parse.h"
+
+/**
+ * Takes the tokenized program and parses them into an array of trees.
+ */
+int
+parseall(struct parsestate *ps)
+{
+	struct parsenode *this;
+
+	while (1) {
+	}
+
+	return 0;
+}

parse.h

@@ -0,0 +1,25 @@
+enum nodetype {
+	NODEIF, NODEELSE, NODEELSIF, NODEWHILE, NODEOP, NODENUM,
+	NODEVAR,
+};
+
+struct parsenode {
+	union {
+		const char *var;
+		char op;
+	} val;
+	const char *filename;
+	struct parsenode *left, *right;
+	int col, line, pos;
+	enum nodetype type;
+};
+
+struct parsestate {
+	struct tokenstate ts;
+	struct parsenode *program;
+	/* progsz is the total size of program */
+	/* progind is the index (where to put the next tree) */
+	size_t progsz, progind;
+};
+
+extern int parseall(struct parsestate *ps);

token.c

@@ -41,7 +41,7 @@ getch(struct tokenstate *ts)
 static inline void
 skip_whitespace(struct tokenstate *ts)
 {
-	while (isspace(ts->look))
+	while (isspace(ts->look) && ts->look != '\n')
 		getch(ts);
 }
 
@@ -268,6 +268,10 @@ tokenize(struct tokenstate *ts)
 			tokenizevarkw(token, ts);
 		else if (ts->look == '"')
 			tokenizestring(token, ts);
+		else if (ts->look == '\n') {
+			token->type = NEWLINE;
+			getch(ts);
+		}
 		else {
 			/* something else, probably an operator */
 			/* don't bother to check here, it's not worth it */

token.h

@@ -1,5 +1,5 @@
 /* please also see token.c */
-enum tokentype { KW, STRING, VAR, NUM, OP };
+enum tokentype { KW, STRING, VAR, NUM, OP, NEWLINE };
 enum kwtype { IF, THEN, ELSIF, ELSE, WHILE, ENDKWTYPE };
 
 struct token {