ahahahahaha

SHANNONTEST/CVal.java

@@ -6,14 +6,14 @@ public class CVal implements Comparable<CVal> {
 	private Object value;
 
 	public CVal(Object v) {
-		if (v == null) {
+		/*if (v == null) {
 			throw new RuntimeException("v == null");
-		}
+		}*/
 		value = v;
 		// only accept one of our datetypes
 		if (!(isNumber() || isDayblock() || isTime() || isTimeblock()
 				|| isDatetime() || isString() || isCourse() || isCourselist() 
-				|| isSchedule() || isFunction() )) {
+				|| isSchedule() || isFunction() || isBoolean() )) {
 			throw new RuntimeException("invalid type: " + v + " ("
 					+ v.getClass() + ")");
 		}
@@ -174,6 +174,10 @@ public boolean isBool(){
 			return false;
 		}
 	}
+
+	public boolean isBoolean() {
+		return value instanceof Boolean;
+	}
 
 	public boolean getBool(){
 		if (this.isBool()){

SHANNONTEST/Chronos.g

@@ -49,11 +49,12 @@ stmt:	expr ('='^ expr)? ';'!
 	;
 selection_stmt
 // matches if and if/else statements
-	:	IF_T expr '{' (a=line)* '}' else_stmt? -> ^(COND expr ^(THEN $a*) else_stmt)
+	:	IF_T expr '{' line* '}' else_stmt? -> ^( COND expr ^(THEN line*) else_stmt? )
+		//-> line*
 	;
-then_stmt
+/*then_stmt
 	:	IF_T expr '{'(a=line)* '}' -> ^(THEN $a*)
-	;
+	;*/
 else_stmt
 	:	ELSE_T '{' (b=line)* '}' -> ^(ELSE_T $b*)
 	;