Merge branch 'generate-instruction_type' into 'master'

Generate instruction_type function

See merge request !156

src-js/Makefile

@@ -9,7 +9,7 @@ WebPublic: $(WASM) abc-interpreter.js ../src/abc_instructions.h
 	cp $(WASM) WebPublic/js
 	cp abc-interpreter.js WebPublic/js
 	echo 'ABCInterpreter.instructions=[' >> WebPublic/js/abc-interpreter.js
-	sed -n 's/^\tINSTRUCTION(\(.*\))/\t"\1",/p' ../src/abc_instructions.h >> WebPublic/js/abc-interpreter.js
+	sed -n 's/^\tINSTRUCTION (\(.*\),.*)/\t"\1",/p' ../src/abc_instructions.h >> WebPublic/js/abc-interpreter.js
 	echo '];' >> WebPublic/js/abc-interpreter.js
 
 %.wasm: %.wat

tools/interpretergen.icl

@@ -42,11 +42,11 @@ where
 	# (e,f) = fend f
 	| e = (reverse is,f)
 	# (l,f) = freadline f
-	| l%(0,12) <> "\tINSTRUCTION(" = fetch_instructions is f
-	# i = l%(13,find_closing_paren 13 l-1)
+	| l%(0,13) <> "\tINSTRUCTION (" = fetch_instructions is f
+	# i = l%(14,find_comma 14 l-1)
 	= fetch_instructions [i:is] f
 	where
-		find_closing_paren i s = if (s.[i]==')') i (find_closing_paren (i+1) s)
+		find_comma i s = if (s.[i]==',') i (find_comma (i+1) s)
 
 instance real TReal  where real t = t
 instance real TDReal where real t = t