moving some test scripts around

Makefile

@@ -61,13 +61,13 @@ compare:
 asm:
 	
 test1:
-	-qasm src/main.s
+	-qasm testdata/3001-lroathe.S
 
 test2:
-	-qasm src/testfile.s
+	-qasm testdata/3002-testfile.S
 
 test3:
-	-qasm src/var.s
+	-qasm testdata/3003-var.S
 	
 	
 

asm.cpp

@@ -1342,6 +1342,11 @@ int CLASS::callOpCode(std::string op, MerlinLine &line)
 				//line.expr_value = (line.expr_value >> 16) & 0xFFFF;
 				break;
 			case '|':
+				if (syntax==SYNTAX_MERLIN)
+				{ 
+					line.setError(errBadLabel);
+					line.expr_value=0;
+				}
 				break;
 		}
 	}

merlintests.sh

@@ -18,8 +18,8 @@ for S in $SRC ; do
 	BASE=${S/.S/}
 	BASE=${BASE/.s/}
 	cd ./testdata
-	#merlin32 $S 2>/dev/null >/dev/null
-	merlin32 . $S 2>/dev/null 
+	merlin32 $S 2>/dev/null >/dev/null
+	#merlin32 . $S 2>/dev/null 
 
 	R=?$
 	cd - >/dev/null

testdata/3000-addresses.S

@@ -0,0 +1,28 @@
+		lst
+		xc
+		xc
+		org	$018200
+
+bank02	equ	$020000
+bank03	equ $030000
+dp		equ	$A5
+long	equ	$020304
+
+		mx	%00
+start	nop
+		pea	^start
+		pea	start
+		mvn	bank02,bank03
+		mvp	bank03,bank02
+		lda	dp
+		lda <dp
+		lda >dp
+		lda ^dp
+		lda |dp
+		lda #long
+		lda #<long
+		lda #>long
+		lda	#^long
+		lda	#|long
+
+		lst off