Added variable type initialization

Makefile

@@ -2,6 +2,7 @@ TARGET = lci
 LIBS = -lm
 OBJS = lexer.o tokenizer.o parser.o interpreter.o unicode.o main.o
 SRCS = lexer.c tokenizer.c parser.c interpreter.c unicode.c main.c
+HDRS = lexer.h tokenizer.h parser.h interpreter.h unicode.h
 INSTALL = /usr/local/bin/install -c
 CPPFLAGS = -O2
 
@@ -18,17 +19,17 @@ pedantic: $(OBJS) $(LIBS)
 	$(CC) -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wundef -W -Wall -ansi -pedantic -g -o $(TARGET) $(OBJS) $(LIBS)
 
 check: all
-	@cd $(testdir) && ./testDir.sh -q ../$(TARGET) 1.2-Tests/
+	@cd $(testdir) && ./testDir.sh -q ../$(TARGET) 1.3-Tests/
 
 check-mem: all
 	@echo "This will take a long time!  Be patient!"
-	@cd $(testdir) && ./testDir.sh -q -m ../$(TARGET) 1.2-Tests/
+	@cd $(testdir) && ./testDir.sh -q -m ../$(TARGET) 1.3-Tests/
 
 install: all
 	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
 
-TAGS: $(SRCS)
-	ctags $(SRCS)
+TAGS: $(SRCS) $(HDRS)
+	ctags $(SRCS) $(HDRS)
 
 docs: Doxyfile $(SRCS)
 	doxygen

interpreter.c

@@ -2722,6 +2722,25 @@ ReturnObject *interpretDeclarationStmtNode(StmtNode *node,     /**< [in] A point
 	}
 	if (stmt->expr)
 		init = interpretExprNode(stmt->expr, scope);
+	else if (stmt->type) {
+		switch (stmt->type->type) {
+			case CT_NIL:
+				init = createNilValueObject();
+				break;
+			case CT_BOOLEAN:
+				init = createBooleanValueObject(0);
+				break;
+			case CT_INTEGER:
+				init = createIntegerValueObject(0);
+				break;
+			case CT_FLOAT:
+				init = createFloatValueObject(0.0);
+				break;
+			case CT_STRING:
+				init = createStringValueObject(createString(""));
+				break;
+		}
+	}
 	else
 		init = createNilValueObject();
 	if (!init) return NULL;

parser.c

@@ -735,7 +735,8 @@ void deleteAssignmentStmtNode(AssignmentStmtNode *node) /**< [in,out] A pointer
   * \see deleteDeclarationStmtNode(DeclarationStmtNode *) */
 DeclarationStmtNode *createDeclarationStmtNode(IdentifierNode *scope,  /**< [in] A pointer to the scope to create the variable in. */
                                                IdentifierNode *target, /**< [in] A pointer to the name of the variable to create. */
-                                               ExprNode *expr)         /**< [in] An optional pointer to the expression to initialize \a target to. */
+                                               ExprNode *expr,         /**< [in] An optional pointer to the expression to initialize \a target to. */
+                                               TypeNode *type)         /**< [in] An optional pointer to the type to initialize \a target to. */
 {
 	DeclarationStmtNode *p = malloc(sizeof(DeclarationStmtNode));
 	if (!p) {
@@ -745,6 +746,7 @@ DeclarationStmtNode *createDeclarationStmtNode(IdentifierNode *scope,  /**< [in]
 	p->scope = scope;
 	p->target = target;
 	p->expr = expr;
+	p->type = type;
 	return p;
 }
 
@@ -762,6 +764,7 @@ void deleteDeclarationStmtNode(DeclarationStmtNode *node) /**< [in,out] A pointe
 	deleteIdentifierNode(node->scope);
 	deleteIdentifierNode(node->target);
 	deleteExprNode(node->expr);
+	deleteTypeNode(node->type);
 	free(node);
 }
 
@@ -2148,6 +2151,7 @@ StmtNode *parseStmtNode(Token ***tokenp,        /**< [in,out] A pointer to the p
 		IdentifierNode *scope = NULL;
 		IdentifierNode *target = NULL;
 		ExprNode *expr = NULL;
+		TypeNode *type = NULL;
 		DeclarationStmtNode *stmt = NULL;
 #ifdef DEBUG
 		debug("ST_DECLARATION");
@@ -2172,6 +2176,14 @@ StmtNode *parseStmtNode(Token ***tokenp,        /**< [in,out] A pointer to the p
 				return NULL;
 			}
 		}
+		else if (acceptToken(&tokens, TT_ITZA)) {
+			type = parseTypeNode(&tokens);
+			if (!type) {
+				deleteIdentifierNode(scope);
+				deleteIdentifierNode(target);
+				return NULL;
+			}
+		}
 		if (!acceptToken(&tokens, TT_NEWLINE)) {
 			error("expected end of statement", tokens);
 			deleteIdentifierNode(scope);
@@ -2179,7 +2191,7 @@ StmtNode *parseStmtNode(Token ***tokenp,        /**< [in,out] A pointer to the p
 			if (expr) deleteExprNode(expr);
 			return NULL;
 		}
-		stmt = createDeclarationStmtNode(scope, target, expr);
+		stmt = createDeclarationStmtNode(scope, target, expr, type);
 		if (!stmt) {
 			deleteIdentifierNode(scope);
 			deleteIdentifierNode(target);

parser.h

@@ -400,12 +400,16 @@ typedef struct {
   * contents of \a expr.  \a scope determines which level of scope the variable
   * is to be created in.
   *
+  * \note \a expr and \a type are mutually exclusive.  If both are non-NULL,
+  *       results are undefined.
+  *
   * \see createDeclarationStmtNode(IdentifierNode *, IdentifierNode *, ExprNode *)
   * \see deleteDeclarationStmtNode(DeclarationStmtNode *) */
 typedef struct {
 	IdentifierNode *scope;  /**< A pointer to the scope to create the variable in. */
 	IdentifierNode *target; /**< A pointer to the name of the variable to create. */
-	ExprNode *expr;         /**< An optional pointer to expression to initialize \a target to. */
+	ExprNode *expr;         /**< An optional pointer to the expression to initialize \a target to. */
+	TypeNode *type;         /**< An optional pointer to the type to initialize \a target to. */
 } DeclarationStmtNode;
 
 /** Stores an if/then/else statement.  A conditional statement checks the value
@@ -552,7 +556,7 @@ void deleteInputStmtNode(InputStmtNode *);
 AssignmentStmtNode *createAssignmentStmtNode(IdentifierNode *, ExprNode *);
 void deleteAssignmentStmtNode(AssignmentStmtNode *);
 
-DeclarationStmtNode *createDeclarationStmtNode(IdentifierNode *, IdentifierNode *, ExprNode *);
+DeclarationStmtNode *createDeclarationStmtNode(IdentifierNode *, IdentifierNode *, ExprNode *, TypeNode *);
 void deleteDeclarationStmtNode(DeclarationStmtNode *);
 
 IfThenElseStmtNode *createIfThenElseStmtNode(BlockNode *, BlockNode *, ExprNodeList *, BlockNodeList *);

test/1.2-Tests/1-Structure/12-EllipsesJoinCR/test.lol

@@ -1 +0,0 @@
-HAI 1.2
	VISIBLE "Lorem "...
	"ipsum "...
	"dolor "...
	"sit"
KTHXBYE

test/1.2-Tests/1-Structure/15-NoNewlineAfterJoinCR/test.lol

@@ -1 +0,0 @@
-HAI 1.2
	VISIBLE "Lorem ipsum "...

	"dolor sit"
KTHXBYE

test/1.2-Tests/1-Structure/4-MustEndWithKTHXBYE/test.lol

@@ -1 +0,0 @@
-HAI 1.2

test/1.2-Tests/1-Structure/8-NewlineCR/test.lol

@@ -1 +0,0 @@
-HAI 1.2
	VISIBLE "Lorem"
	VISIBLE "ipsum"
	VISIBLE "dolor"
	VISIBLE "sit"
KTHXBYE

test/1.2-Tests/11-Unicode/2-EllipsesJoinCR/test.lol

@@ -1 +0,0 @@
-HAI 1.2
	VISIBLE "Lorem "…
	"ipsum "…
	"dolor "…
	"sit"
KTHXBYE

test/1.3-Tests/1-Structure/1-EmptyMainBlock/test.lol

@@ -1,2 +1,2 @@
-HAI 1.2
+HAI 1.3
 KTHXBYE

test/1.3-Tests/1-Structure/10-CommasSeparate/test.lol

@@ -1,3 +1,3 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem", VISIBLE "ipsum", VISIBLE "dolor", VISIBLE "sit"
 KTHXBYE

test/1.3-Tests/1-Structure/11-EllipsesJoinLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem "...
 	"ipsum "...
 	"dolor "...

test/1.3-Tests/1-Structure/12-EllipsesJoinCR/test.lol

@@ -0,0 +1 @@
+HAI 1.3
	VISIBLE "Lorem "...
	"ipsum "...
	"dolor "...
	"sit"
KTHXBYE

test/1.3-Tests/1-Structure/13-EllipsesJoinCRLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem "...
 	"ipsum "...
 	"dolor "...

test/1.3-Tests/1-Structure/14-NoNewlineAfterJoinLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem ipsum "...
 
 	"dolor sit"

test/1.3-Tests/1-Structure/15-NoNewlineAfterJoinCR/test.lol

@@ -0,0 +1 @@
+HAI 1.3
	VISIBLE "Lorem ipsum "...

	"dolor sit"
KTHXBYE

test/1.3-Tests/1-Structure/16-NoNewlineAfterJoinCRLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem ipsum "...
 
 	"dolor sit"

test/1.3-Tests/1-Structure/4-MustEndWithKTHXBYE/test.lol

@@ -0,0 +1 @@
+HAI 1.3

test/1.3-Tests/1-Structure/5-IndentationIgnored/test.lol

@@ -1,3 +1,3 @@
-	HAI 1.2
+	HAI 1.3
         VISIBLE "Lorem ipsum dolor sit"
 	KTHXBYE

test/1.3-Tests/1-Structure/6-WhitespaceBetweenTokens/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE    "Lorem "    "ipsum "    "dolor "    "sit"
 	VISIBLE			"Lorem "			"ipsum "			"dolor "			"sit"
 	VISIBLE 	 "Lorem " 	 "ipsum " 	 "dolor " 	 "sit"

test/1.3-Tests/1-Structure/7-NewlineLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem"
 	VISIBLE "ipsum"
 	VISIBLE "dolor"

test/1.3-Tests/1-Structure/8-NewlineCR/test.lol

@@ -0,0 +1 @@
+HAI 1.3
	VISIBLE "Lorem"
	VISIBLE "ipsum"
	VISIBLE "dolor"
	VISIBLE "sit"
KTHXBYE

test/1.3-Tests/1-Structure/9-NewlineCRLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem"
 	VISIBLE "ipsum"
 	VISIBLE "dolor"

test/1.3-Tests/10-Loops/1-Breaks/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	I HAS A var ITZ 0
 	IM IN YR loop
 		VISIBLE var

test/1.3-Tests/10-Loops/2-Increment/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	IM IN YR loop UPPIN YR var
 		VISIBLE var
 		BOTH SAEM var AN 9

test/1.3-Tests/10-Loops/3-Decrement/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	IM IN YR loop NERFIN YR var
 		VISIBLE var
 		BOTH SAEM var AN -9

test/1.3-Tests/10-Loops/4-Until/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	IM IN YR loop UPPIN YR var TIL BOTH SAEM var AN 10
 		VISIBLE var
 	IM OUTTA YR loop

test/1.3-Tests/10-Loops/5-While/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	IM IN YR loop NERFIN YR var WILE DIFFRINT var AN -10
 		VISIBLE var
 	IM OUTTA YR loop

test/1.3-Tests/10-Loops/6-UnaryFunction/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	HOW DUZ I plustwoin YR var
 		FOUND YR SUM OF var AN 2
 	IF U SAY SO

test/1.3-Tests/10-Loops/7-EmptyBody/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "a"
 	IM IN YR loop UPPIN YR var TIL BOTH SAEM var AN 10
 	IM OUTTA YR loop

test/1.3-Tests/10-Loops/8-UntilMustIncludeVar/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	IM IN YR loop TIL WIN
 	IM OUTTA YR loop
 KTHXBYE

test/1.3-Tests/10-Loops/9-WhileMustIncludeVar/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	IM IN YR loop WILE FAIL
 	IM OUTTA YR loop
 KTHXBYE

test/1.3-Tests/11-Unicode/1-EllipsesJoinLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem "…
 	"ipsum "…
 	"dolor "…

test/1.3-Tests/11-Unicode/2-EllipsesJoinCR/test.lol

@@ -0,0 +1 @@
+HAI 1.3
	VISIBLE "Lorem "…
	"ipsum "…
	"dolor "…
	"sit"
KTHXBYE

test/1.3-Tests/11-Unicode/3-EllipsesJoinCRLF/test.lol

@@ -1,4 +1,4 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem "…
 	"ipsum "…
 	"dolor "…

test/1.3-Tests/11-Unicode/4-Strings/test.lol

@@ -1,3 +1,3 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "ʇıs ɹoʃop ɯnsdı ɯǝɹo⅂"
 KTHXBYE

test/1.3-Tests/11-Unicode/5-CodePointInString/test.lol

@@ -1,3 +1,3 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem :(0024) ipsum :(00A2) dolor :(20AC) sit :(024B62)"
 KTHXBYE

test/1.3-Tests/11-Unicode/6-NormativeNameInString/test.lol

@@ -1,3 +1,3 @@
-HAI 1.2
+HAI 1.3
 	VISIBLE "Lorem :[DOLLAR SIGN] ipsum :[CENT SIGN] dolor :[EURO SIGN] sit"
 KTHXBYE