From 59f362f441860d20be4bd72136342eb5f351b142 Mon Sep 17 00:00:00 2001
From: Andrew Alderwick <andrew@alderwick.co.uk>
Date: Wed, 14 Apr 2021 22:00:10 +0100
Subject: [PATCH] Further progress on assembler

---
 etc/assembler-test.usm          |  3 +++
 projects/software/assembler.usm | 23 +++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/etc/assembler-test.usm b/etc/assembler-test.usm
index 03f1750..b4f950e 100644
--- a/etc/assembler-test.usm
+++ b/etc/assembler-test.usm
@@ -12,3 +12,6 @@
 NOPa2r
 swap16
 
+@testme
+	,Hello.testing
+
diff --git a/projects/software/assembler.usm b/projects/software/assembler.usm
index 3dffab7..a52b750 100644
--- a/projects/software/assembler.usm
+++ b/projects/software/assembler.usm
@@ -1,5 +1,5 @@
 ;tree { search-key 2 max-key-len 1 }
-;assembler { pass 1 state 1 token 2 scope-len 1 scope 80 heap 2 addr 2 subtree 2 vartmp 2 }
+;assembler { pass 1 state 1 token 2 scope-len 1 scope 80 heap 2 addr 2 subtree 2 vartmp 2 field 2 }
 
 %HCF { #0000 DIV }
 %SHORT_FLAG { #20 }
@@ -281,11 +281,25 @@
 
 @lookup-label ( string-ptr* -- address* node-type if found
                             OR false-address* 00 if not found )
-	( FIXME deal with dotted labels )
+	DUP2
+	$loop
+	DUP2 #0001 ADD2 SWP2 PEK2
+	DUP #2e EQU ^$dotted JNZ
+	^$loop JNZ
+	DUP2 EOR2 ( faster than POP2 #0000 )
+	=assembler.field
+
+	$main
 	DUP2 ,label-tree SWP2 #ff ,traverse-tree JSR2
 	^$not-found JNZ
 
 	SWP2 POP2
+	~assembler.field #0000 EQU2 ^$end JNZ
+	DUP2 PEK2 #80 LTH ^$not-found JNZ
+	#0003 ADD2 ~assembler.field #ff ,traverse-tree JSR2
+	^$not-found JNZ
+
+	$end
 	DUP2 #0001 ADD2 LDR2 SWP2 PEK2
 	JMP2r
 
@@ -298,6 +312,11 @@
 	#00
 	JMP2r
 
+	$dotted
+	DUP OVR2 =assembler.field
+	EOR ROT ROT #0001 SUB2 POK2
+	^$main JMP
+
 @write-byte ( byte -- )
 	( FIXME ) =Console.byte
 	~assembler.addr #0001 ADD2 =assembler.addr