Merge pull request #24 from opensourcecobol/dev/y-sakamoto

CALL呼び出しの引数の変換処理を追加した

Author: ytr-sakamoto

cobc/codegen.c

@@ -2739,9 +2739,9 @@ joutput_call (struct cb_call *p)
 					break;
 				case CB_TAG_LITERAL:
 					if (CB_TREE_CLASS (x) == CB_CLASS_NUMERIC) {
-						joutput ("%d", cb_get_int (x));
+						joutput ("CobolDataStorage.primitiveToDataStorage(%d)", cb_get_int (x));
 					} else {
-						joutput ("%d", CB_LITERAL (x)->data[0]);
+						joutput ("CobolDataStroage.primitiveToDataStorage(%d)", CB_LITERAL (x)->data[0]);
 					}
 					break;
 				default:

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

@@ -89,6 +89,17 @@ public ByteBuffer getByteBuffer(int size) {
 	public void addIndex(int n) {
 		this.index += n;
 	}
+	
+	static public CobolDataStorage primitiveToDataStorage(int n) {
+		byte[] bytes = new byte[4];
+		ByteBuffer buffer = ByteBuffer.wrap(bytes);
+		buffer.putInt(n);
+		return new CobolDataStorage(bytes);
+	}
+	
+	static public CobolDataStorage primitiveToDataStorage(String s) {
+		return new CobolDataStorage(s);
+	}
 
 	/**
 	 * コンストラクタ.文字列からバイト配列を構成する.

tests/i18n_sjis.at

@@ -22,11 +22,11 @@ AT_INIT([I18n Shift_JIS Tests])
 
 AT_TESTED([cobc])
 
-#m4_include([user-defined-word.at])
-m4_include([pic-x.at])
-m4_include([pic-n.at])
-#m4_include([program-id.at])
-#m4_include([error-print.at])
-#m4_include([limits.at])
-m4_include([national.at])
-#m4_include([mb-space.at])
+m4_include([user-defined-word.at])
+#m4_include([pic-x.at])
+#m4_include([pic-n.at])
+m4_include([program-id.at])
+m4_include([error-print.at])
+m4_include([limits.at])
+#m4_include([national.at])
+m4_include([mb-space.at])