コミット: e78e004f6fc573b9d3e3f4b1d2f614ebdbdde2a2 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

コミットメタ情報

• リビジョン: e78e004f6fc573b9d3e3f4b1d2f614ebdbdde2a2 (tree)
• 日時: 2019-05-14 04:20:46
• 作者: Katsumi <kmorimatsu@sour...>
• コミッター: Katsumi

ログメッセージ

Add CLIB::METHOD style for calling C library

変更サマリ

• modified: mips/megalopa/class.c
• modified: mips/megalopa/clib.c
• modified: mips/megalopa/compiler.h
• modified: mips/megalopa/debug.c
• modified: mips/megalopa/error.c
• modified: mips/megalopa/function.c

差分

--- a/mips/megalopa/class.c
+++ b/mips/megalopa/class.c
@@ -876,7 +876,8 @@ char* static_method(char type){
 	char* err;
 	int* data;
 	int record[3];
-	int i,opos,method,stack;
+	int i,spos,opos,method,stack;
+	spos=g_srcpos;
 	next_position();
 	// Check class name
 	i=check_var_name();
@@ -891,12 +892,15 @@ char* static_method(char type){
 			break;
 		}
 	}
+	if (i) {
+		g_srcpos=spos;
+		return ERR_NO_CLASS;
+	}
 	// Check '::'
 	if (g_source[g_srcpos]!=':') return ERR_SYNTAX;
 	g_srcpos++;
 	if (g_source[g_srcpos]!=':') return ERR_SYNTAX;
 	g_srcpos++;
-	if (i) return ERR_NO_CLASS;
 	data=(int*)data[2];
 	// Check method
 	i=check_var_name();

--- a/mips/megalopa/clib.c
+++ b/mips/megalopa/clib.c
@@ -273,13 +273,14 @@ void lib_clib(int* params, void* address){
 	asm volatile("addu $gp,$s0,$zero");
 }
 
-char* clib_statement(){
+char* clib_method(char type){
 	char* err;
 	int* record;
 	int clib,func;
-	int numparams,stack;
+	int numparams,stack,spos;
 	// CLIB name
 	next_position();
+	spos=g_srcpos;
 	clib=check_var_name();
 	if (clib<65536) return ERR_SYNTAX;
 	// Check if the clib exists
@@ -287,11 +288,13 @@ char* clib_statement(){
 	while (record=cmpdata_find(CMPDATA_USECLIB)){
 		if (record[1]==clib) break;
 	}
-	if (!record) return ERR_NO_CLIB;
-	next_position();
-	if (g_source[g_srcpos++]!=',') return ERR_SYNTAX;
+	if (!record) {
+		g_srcpos=spos;
+		return ERR_NO_CLIB;
+	}
+	if (g_source[g_srcpos++]!=':') return ERR_SYNTAX;
+	if (g_source[g_srcpos++]!=':') return ERR_SYNTAX;
 	// Function name
-	next_position();
 	func=check_var_name();
 	if (func<65536) return ERR_SYNTAX;
 	cmpdata_reset();
@@ -299,23 +302,43 @@ char* clib_statement(){
 		if (record[1]==clib && record[2]==func) break;
 	}
 	if (!record) return "Function not found in the C library";
+	// Check type and following syntax
+	if (type==',') {
+		// This is CLIB(CLASS:METHOD) style
+	} else {		
+		// Type is either 0 (integer), $ (string), or # (float)
+		// This is CLASS::METHOD() style
+		if (type) {
+			if (g_source[g_srcpos++]!=type) return ERR_SYNTAX;
+		}
+		if (g_source[g_srcpos++]!='(') return ERR_SYNTAX;
+	}
 	// Construct parameter(s)
 	next_position();
 	numparams=0;
-	while (g_source[g_srcpos]==',') {
-		numparams++;
-		if (4<numparams) return ERR_SYNTAX;
-		else if (1==numparams) {
+	if (','==type && g_source[g_srcpos]!=',') {
+		// This is CLIB(CLASS:METHOD) style
+		// no parameter
+	} else if (','!=type && g_source[g_srcpos]==')') {
+		// This is CLASS::METHOD() style
+		// no parameter
+	} else {
+		// There is parameter(s)
+		do {
+			numparams++;
+			if (4<numparams) return ERR_SYNTAX;
+			else if (1==numparams) {
+				check_obj_space(1);
+				stack=g_objpos++;
+			}
+			if (g_source[g_srcpos]==',') g_srcpos++;
+			g_object[stack]=0x27BD0000|(65536-numparams*4);                     // addiu sp,sp,-xx
+			err=get_stringFloatOrValue();
+			if (err) return err;
 			check_obj_space(1);
-			stack=g_objpos++;
-		}
-		g_srcpos++;
-		g_object[stack]=0x27BD0000|(65536-numparams*4);                     // addiu sp,sp,-xx
-		err=get_stringFloatOrValue();
-		if (err) return err;
-		check_obj_space(1);
-		g_object[g_objpos++]=0xAFA20000|(numparams*4);                      // sw    v0,xx(sp)
-		next_position();
+			g_object[g_objpos++]=0xAFA20000|(numparams*4);                      // sw    v0,xx(sp)
+			next_position();
+		} while (g_source[g_srcpos]==',');
 	}
 	// Call CLIB
 	check_obj_space(2);
@@ -327,3 +350,6 @@ char* clib_statement(){
 	return 0;
 }
 
+char* clib_statement(){
+	return clib_method(',');
+}
\ No newline at end of file

--- a/mips/megalopa/compiler.h
+++ b/mips/megalopa/compiler.h
@@ -396,6 +396,7 @@ char* interrupt_statement();
 
 char* useclib_statement();
 char* useclib_begin(char* buff);
+char* clib_method(char type);
 char* clib_statement();
 
 char* hex_init_file(char* buff,char* filename);
@@ -438,6 +439,7 @@ char* hex_construct_line();
 #define ERR_COMPILE_CLIB (char*)(g_err_str[30])
 #define ERR_NO_CLIB (char*)(g_err_str[31])
 #define ERR_HEX_ERROR (char*)(g_err_str[32])
+#define ERR_NO_CLASS_CLIB (char*)(g_err_str[32])
 
 /* compile data type numbers */
 #define CMPDATA_RESERVED  0

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -235,8 +235,8 @@ static const char initext[]=
 static const char bastext[]=
 "useclib TCLIB\n"
 "CLS\n"
-"print clib$(TCLIB,TEST,0);\n"
-"print clib$(TCLIB,TEST,1)\n"
+"print TCLIB::TEST$(0);\n"
+"print clib$(TCLIB::TEST,1)\n"
 "\n"
 "\n"
 "\n"
@@ -266,26 +266,31 @@ static const char hextext[]=
 ":108020001c80998f09f82003000000001000bc8f0d\n"
 ":108030002080828f1c00bf8f0800e0032000bd2736\n"
 ":020000040000fa\n"
-":107f80000000000000000080a07f00a0708000a022\n"
-":107f9000fc8000a0000001a0788000a0000000008c\n"
+":107f80000000000000000080a87f00a0408000a04a\n"
+":107f9000408100a0000001a0f08000a0048100a0aa\n"
+":087fa000488000a00000000071\n"
 ":020000040000fa\n"
-":108070000800e0030000000000001c3cf87e9c2784\n"
-":1080800021e09903040080542480828f2480828f11\n"
-":108090000800e003d48042240800e003e480422486\n"
-":1080a00000001c3cd07e9c2721e09903e0ffbd2707\n"
-":1080b0001c00bfaf1000bcaf2880998f09f82003c7\n"
-":1080c000000000001000bc8f1c00bf8f0800e00300\n"
-":0480d0002000bd27a8\n"
+":108040000800e0030000000000001c3c287f9c2783\n"
+":1080500021e09903040080542480828f2480828f41\n"
+":108060000800e003188142240800e003288142242c\n"
+":1080700000001c3c007f9c2721e09903d8ffbd270e\n"
+":108080002400bfaf2000b1af1c00b0af1000bcafe8\n"
+":10809000218880001880908f040004240000058e41\n"
+":1080a0002880998f09f82003000000001000bc8f81\n"
+":1080b000212040000000058e2c80998f09f82003b4\n"
+":1080c000000000001000bc8f212020023080998f1a\n"
+":1080d00009f82003000000001000bc8f2400bf8faf\n"
+":1080e0002000b18f1c00b08f0800e0032800bd27de\n"
+":1080f0000000a28c080040000800bc8c0800e003cf\n"
+":10810000000000000400a28c080040000800bc8ca5\n"
+":088110000800e003000000007c\n"
 ":020000040000fa\n"
-":1080d40048656c6c6f20576f726c6421000000005f\n"
-":1080e4005468697320697320612074657374000097\n"
-":0880f400544553540000000044\n"
+":1081180048656c6c6f20576f726c6421000000001a\n"
+":108128005468697320697320612074657374000052\n"
+":088138005445535400000000ff\n"
 ":020000040000fa\n"
-":1080fc0040010000800000001c8100a00000000076\n"
-":020000040000fa\n"
-":10810c0000000000222222222222222222222222cb\n"
-":020000040000fa\n"
-":0c811c00f48000a0a08000a00000000083\n"
+":108140004001000080000000508100a000000000fd\n"
+":0c815000388100a0708000a0000000003a\n"
 ":00000001FF\n"
 ;
 

--- a/mips/megalopa/error.c
+++ b/mips/megalopa/error.c
@@ -45,6 +45,7 @@ const char* g_err_str[]={
 	"ERR_COMPILE_CLIB",
 	"C library not found",
 	"HEX file syntax error",
+	"Class or C library not found",
 };
 
 char* resolve_label(int s6){

--- a/mips/megalopa/function.c
+++ b/mips/megalopa/function.c
@@ -501,7 +501,10 @@ char* float_function(void){
 	} else {
 		// Check if static method of a class
 		err=static_method('#');
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method('#');
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
@@ -542,7 +545,10 @@ char* str_function(void){
 	} else {
 		// Check if static method of a class
 		err=static_method('$');
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method('$');
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
@@ -630,9 +636,12 @@ char* function(void){
 		f=int_func_list[i+1];
 		err=f();
 	} else {
-		// Check if static method of a class
+		// Check if static method of a class of clib
 		err=static_method(0);
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method(0);
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;