fill genCode() method [12]

Author: isac322

src/CodeGenerator/DefinedFunction.java

@@ -31,7 +31,7 @@ public class DefinedFunction {
 			"getHour", "getMin", "getSec", "getYear", "getMonth", "getDay",
 			"addTime", "subTime", "mulTime", "divTime", "modTime",
 			"addDate", "subDate",
-			"validTime"
+			"validTime", "daysToDate"
 	};
 
 	public static final HashSet<String> predefinedFunc = new HashSet<>(Arrays.asList(customFunc));
@@ -65,6 +65,7 @@ public static void defineFunc(FunctionSet functionSet, HashMap<String, ArrayList
 
 		createFunc(Type.DATE, "addDate", dateParam, dateParam);
 		createFunc(Type.DATE, "subDate", dateParam, dateParam);
+		createFunc(Type.DATE, "daysToDate", intParam);
 	}
 
 	private static void createFunc(Type type, String name, ParamDeclaration... params) {
@@ -258,14 +259,13 @@ protected static void addDate() {
 		CodeGenerator.genCode("lod", 2, 2);
 		CodeGenerator.genCode("add");
 
-		CodeGenerator.call("validDate");
-
+		CodeGenerator.genCode("retv");
 		CodeGenerator.genCode("end");
 	}
 
 	protected static void subDate() {
 		// todo
-		CodeGenerator.genFunc("addDate", 2, 2, 2);
+		CodeGenerator.genFunc("subDate", 2, 2, 2);
 		CodeGenerator.genCode("sym", 2, 1, 1);
 		CodeGenerator.genCode("sym", 2, 2, 1);
 
@@ -277,6 +277,17 @@ protected static void subDate() {
 		CodeGenerator.genCode("end");
 	}
 
+	protected static void daysToDate() {
+		// todo 확인
+		CodeGenerator.genFunc("daysToDate", 1, 2, 2);
+		CodeGenerator.genCode("sym", 2, 1, 1);
+
+		CodeGenerator.genCode("lod", 2, 1);
+
+		CodeGenerator.genCode("retv");
+		CodeGenerator.genCode("end");
+	}
+
 	protected static void run(String name) {
 		try {
 			DefinedFunction.class.getDeclaredMethod(name).invoke(null);

src/Syntax/DateValue.java

@@ -19,7 +19,7 @@ public class DateValue extends Value {
 	 */
 	protected final int year, month, day;
 
-	protected final static long base = new GregorianCalendar(0, 0, 0).getTimeInMillis() * -1;
+	protected final static long base = new GregorianCalendar(1, 0, 3).getTimeInMillis() * -1;
 
 	protected Calendar calendar;
 
@@ -61,15 +61,18 @@ protected void V(HashMap<String, Init> declarationMap) {
 		if (valid) return;
 
 		check(year >= 0, "year can not be negative value");
-		check(month >= 1 && month <= 12, "month value must be between 1 and 12");
-		check(month >= 1 && month <= 31, "day value must be between 1 and 31");
+		check(month >= 0, "month can not be negative value");
+		check(day >=0, "day can not be negative value");
 
 		calendar = new GregorianCalendar(year, month - 1, day);
 
 		int rightYear = calendar.get(Calendar.YEAR);
 		int rightMonth = calendar.get(Calendar.MONTH);
 		int rightDay = calendar.get(Calendar.DATE);
 
+		System.out.println(year + " " + month + " " + day);
+		System.out.println(calendar.getTime());
+
 		check(rightYear == year && rightMonth + 1 == month && rightDay == day,
 				"wrong date type declaration. should be : " + rightYear + "/" + rightMonth + "/" + rightDay);
 

src/Syntax/Unary.java

@@ -193,17 +193,13 @@ public void genCode() {
 				if (term instanceof Variable) {
 					Variable temp = (Variable) term;
 
-					CodeGenerator.ldp();
-
 					CodeGenerator.lod(temp.name);
 					if (op.value.equals(Operator.DATE_PP)) {
 						CodeGenerator.inc();
 					} else {
 						CodeGenerator.dec();
 					}
 
-					CodeGenerator.call("validDate");
-
 					CodeGenerator.str(temp.name);
 
 				} else if (term instanceof ArrayRef) {
@@ -213,22 +209,15 @@ public void genCode() {
 					temp.index.genCode();
 					CodeGenerator.add();
 
-
-					CodeGenerator.ldp();
-
-					CodeGenerator.lda(temp.name);
-					temp.index.genCode();
-					CodeGenerator.add();
-
+					CodeGenerator.dup();
 					CodeGenerator.ldi();
+
 					if (op.value.equals(Operator.DATE_PP)) {
 						CodeGenerator.inc();
 					} else {
 						CodeGenerator.dec();
 					}
 
-					CodeGenerator.call("validDate");
-
 
 					CodeGenerator.sti();
 				}