[ASM] Improve ValueParser test

Author: tgtakaoka

src/value_parser.cpp

@@ -105,7 +105,7 @@ Value ValueParser::eval(
     const auto start = scan.skipSpaces();
     const auto value = _eval(scan, error, symtab, delim);
     if (scan.str() == start.str())
-        error.setErrorIf(start, GARBAGE_AT_END);
+        error.setErrorIf(start, NOT_AN_EXPECTED);
     return value;
 }
 

test/Makefile

@@ -84,7 +84,7 @@ endef
 $(eval $(foreach a,$(ARCHS),$(call test-rule,$(a))))
 
 # make rule for testing expression.
-EXPRS = base motorola intel national fairchild zilog
+EXPRS = base fairchild intel motorola national zilog
 define test-expr # expr
 test_expr_$(1): test_expr_$(1).o $$(OBJS_expr) $$(OBJS_test)
 	$$(CXX) -o $$@ $$(CXXFLAGS) $$^

test/test_asm_ins8060.cpp

@@ -290,7 +290,7 @@ static void test_error() {
     ERUS("LD (P3)", "P3)", 0xC0, 0x00);
     ERUS("LD (E)",  "E)",  0xC0, 0x00);
     ERRT("LD 1(E)", UNKNOWN_OPERAND, "1(E)");
-    ERRT("LDI #1",  GARBAGE_AT_END, "#1");
+    ERRT("LDI #1",  NOT_AN_EXPECTED, "#1");
     ERRT("LD 1(P3 ;comment", MISSING_CLOSING_PAREN, " ;comment");
 }
 

test/test_asm_ins8070.cpp

@@ -446,9 +446,9 @@ static void test_undef() {
 }
 
 static void test_error() {
-    ERRT("LD A,@@1,P3", GARBAGE_AT_END, "@1,P3");
-    ERRT("LD A,@#1",    GARBAGE_AT_END, "#1");
-    ERRT("LD A,@=1",    GARBAGE_AT_END, "=1");
+    ERRT("LD A,@@1,P3", NOT_AN_EXPECTED, "@1,P3");
+    ERRT("LD A,@#1",    NOT_AN_EXPECTED, "#1");
+    ERRT("LD A,@=1",    NOT_AN_EXPECTED, "=1");
     ERRT("LD A,1(P3)",  MISSING_COMMA,     "1(P3)"); // SC/MP style
     ERRT("LD A,@1(P3)", MISSING_COMMA,    "@1(P3)"); // SC/MP style
     ERRT("LD A,1,EA",   REGISTER_NOT_ALLOWED, "EA");

test/test_asm_tms7000.cpp

@@ -385,13 +385,13 @@ void test_error() {
     ERRT("CLR R000  ; comment", UNDEFINED_SYMBOL, "R000  ; comment", 0xD5, 0x00);
     ERRT("CLR R256  ; comment", UNDEFINED_SYMBOL, "R256  ; comment", 0xD5, 0x00);
     ERRT("CLR R     ; comment", UNDEFINED_SYMBOL, "R     ; comment", 0xD5, 0x00);
-    ERRT("CLR > D6  ; comment", GARBAGE_AT_END,   "> D6  ; comment");
+    ERRT("CLR > D6  ; comment", NOT_AN_EXPECTED,  "> D6  ; comment");
 
     ERRT("ANDP A, P132X", OPERAND_NOT_ALLOWED, "A, P132X");
     ERRT("ANDP A, P000",  OPERAND_NOT_ALLOWED, "A, P000");
     ERRT("ANDP A, P256",  OPERAND_NOT_ALLOWED, "A, P256");
     ERRT("ANDP A, P",     OPERAND_NOT_ALLOWED, "A, P");
-    ERRT("ANDP A, > 184", GARBAGE_AT_END,      "> 184");
+    ERRT("ANDP A, > 184", NOT_AN_EXPECTED,     "> 184");
 
     ERRT("MOVD %>A9AA(A), R171",  REGISTER_NOT_ALLOWED, "A), R171");
     ERRT("MOVD %>A9AA(R3), R171", REGISTER_NOT_ALLOWED, "R3), R171");