ORDINAL-A-ONLY等の実装と,isNumeric()の修正

Author: ytr-sakamoto

cobc/codegen.c

@@ -5519,6 +5519,72 @@ joutput_main_function (struct cb_program *prog)
 	joutput_indent ("}\n");
 }
 
+/*
+ * Class definition
+ */
+
+static void
+joutput_class_name_definition (struct cb_class_name *p)
+{
+	cb_tree		l;
+	cb_tree		x;
+	unsigned char	*data;
+	size_t		i;
+	size_t		size;
+	int		lower;
+	int		upper;
+
+	joutput_line ("static boolean");
+	joutput_line ("%s (AbstractCobolField f)", p->cname);
+	joutput_indent ("{");
+	joutput_line ("for (int i = 0; i < f.getSize(); i++)");
+	joutput_prefix ();
+	joutput ("  if (!(    ");
+	for (l = p->list; l; l = CB_CHAIN (l)) {
+		x = CB_VALUE (l);
+		if (CB_PAIR_P (x)) {
+			lower = literal_value (CB_PAIR_X (x));
+			upper = literal_value (CB_PAIR_Y (x));
+			if (!lower) {
+				joutput ("f.getDataStorage().getByte(i) <= %d", upper);
+			} else {
+				joutput ("(%d <= f.getDataStorage().getByte(i) && f.getDataStorage().getByte(i) <= %d)", lower, upper);
+			}
+		} else {
+			if (CB_TREE_CLASS (x) == CB_CLASS_NUMERIC) {
+				joutput ("f.getDataStorage().getByte(i) == %d", literal_value(x));
+			} else if (x == cb_space) {
+				joutput ("f.getDataStorage().getByte(i) == %d", ' ');
+			} else if (x == cb_zero) {
+				joutput ("f.getDataStorage().getByte(i) == %d", '0');
+			} else if (x == cb_quote) {
+				joutput ("f.getDataStorage().getByte(i) == %d", '"');
+			} else if (x == cb_null) {
+				joutput ("f.getDataStorage().getByte(i) == 0");
+			} else {
+				size = CB_LITERAL (x)->size;
+				data = CB_LITERAL (x)->data;
+				for (i = 0; i < size; i++) {
+					joutput ("f.getDataStorage().getByte(i) == %d", data[i]);
+					if (i + 1 < size) {
+						joutput (" || ");
+					}
+				}
+			}
+		}
+		if (CB_CHAIN (l)) {
+			joutput ("\n");
+			joutput_prefix ();
+			joutput ("         || ");
+		}
+	}
+	joutput (" ))\n");
+	joutput_line ("    return false;");
+	joutput_line ("return true;");
+	joutput_indent ("}");
+	joutput_newline ();
+}
+
 void
 codegen (struct cb_program *prog, const int nested, char** program_id_list)
 {
@@ -5621,13 +5687,13 @@ codegen (struct cb_program *prog, const int nested, char** program_id_list)
 	joutput("\n");
 
 	joutput_line("public class %s implements CobolRunnable {", prog->program_id);
-    joutput_indent_level += 2;
+	joutput_indent_level += 2;
 	joutput("\n");
 
 	joutput_line("private boolean initialized = false;");
 	joutput_line("private CobolModule cobolCurrentModule;");
-    joutput_line("private int frameIndex;");
-    joutput_line("private CobolModule module;");
+	joutput_line("private int frameIndex;");
+	joutput_line("private CobolModule module;");
 	joutput_line("private CobolFrame frame;");
 	joutput_line("private CobolFrame[] frameStack;");
 	joutput_line("private static boolean cobolInitialized = false;");
@@ -5657,9 +5723,9 @@ codegen (struct cb_program *prog, const int nested, char** program_id_list)
 
 	/* Class-names */
 	if (!prog->nested_level && prog->class_name_list) {
-		//output ("/* Class names */\n");
+		joutput ("/* Class names */\n");
 		for (l = prog->class_name_list; l; l = CB_CHAIN (l)) {
-			//output_class_name_definition (CB_CLASS_NAME (CB_VALUE (l)));
+			joutput_class_name_definition (CB_CLASS_NAME (CB_VALUE (l)));
 		}
 	}
 

libcobj/src/jp/osscons/opensourcecobol/libcobj/call/CobolResolve.java

@@ -190,45 +190,38 @@ static public CobolRunnable resolve(AbstractCobolField cobolField) throws CobolC
 	static public CobolRunnable resolve(String name) throws CobolCallException {
 		String fullName;
 		CobolRunnable runnable = null;
-		System.out.println("[dbg in lib] 0");
 
 		/* encode program name */
 		char c1 = name.charAt(0);
 		if(c1 >= '0' && c1 <= '9') {
 			name = "_" + name;
 		}
-		System.out.println("[dbg in lib] 1");
 		name = name.replaceAll("-", "__");
-		System.out.println("[dbg in lib] 2");
 
 		/* search the cache */
 		if(callTable.containsKey(name)) {
 			return callTable.get(name);
 		}
 
-		System.out.println("[dbg in lib] 3");
 		if(name_convert == 1) {
 			name = name.toLowerCase();
 		}else if(name_convert == 2) {
 			name = name.toUpperCase();
 		}
 
-		System.out.println("[dbg in lib] 4");
 		if(defaultPackageName != null) {
 			fullName = defaultPackageName + "." + name;
 		}else {
 			fullName = name;
 		}
 
-		System.out.println("[dbg in lib] 5");
 		/* search the main program */
 		runnable = getInstance(fullName);
 		if(runnable != null) {
 			callTable.put(name, runnable);
 			return runnable;
 		}
 
-		System.out.println("[dbg in lib] 6");
 		/* search external modules */
 		for (String package_path : package_paths) {
 			fullName = package_path + "." + name;
@@ -239,7 +232,6 @@ static public CobolRunnable resolve(String name) throws CobolCallException {
 			}
 		}
 
-		System.out.println("[dbg in lib] 7");
 		//Not found
 		throw new CobolCallException();
 	}

libcobj/src/jp/osscons/opensourcecobol/libcobj/data/AbstractCobolField.java

@@ -1040,6 +1040,7 @@ public boolean isNumeric() {
 			int size = this.getFieldSize();
 			int firstIndex = this.getFirstDataIndex();
 			sign = this.getSign();
+			this.putSign(1);
 			for(i=0; i < size; ++i) {
 				c = (char)this.getDataStorage().getByte(i + firstIndex);
 				if(!Character.isDigit(c)) {