From 9131cbd1d39efc223c1c6307e7bcbdda500ffa8e Mon Sep 17 00:00:00 2001
From: Tim Vaughan <tgvaughan@gmail.com>
Date: Mon, 2 May 2016 13:19:53 +1200
Subject: [PATCH] Better placement of built-in constant/variable word defs.

---
 src/forth.jl | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/forth.jl b/src/forth.jl
index 64d2d23..a52b675 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -219,6 +219,25 @@ EXIT = defPrimWord("EXIT", () -> begin
     return NEXT
 end)
 
+# Dictionary entries for core built-in variables, constants
+
+HERE_CFA = defExistingVar("HERE", HERE)
+LATEST_CFA = defExistingVar("LATEST", LATEST)
+PSP0_CFA = defExistingVar("PSP0", PSP0)
+RSP0_CFA = defExistingVar("RSP0", RSP0)
+
+defConst("DOCOL", DOCOL)
+defConst("DOCON", DOCON)
+defConst("DOVAR", DOVAR)
+
+defConst("DICT", DICT)
+
+F_IMMED = defConst("F_IMMED", 128)
+F_HIDDEN = defConst("F_HIDDEN", 256)
+F_LENMASK = defConst("F_LENMASK", 127)
+
+
+
 # Basic forth primitives
 
 DROP = defPrimWord("DROP", () -> begin
@@ -512,27 +531,6 @@ SUBSTORE = defPrimWord("-!", () -> begin
 end)
 
 
-# Built-in variables
-
-HERE_CFA = defExistingVar("HERE", HERE)
-LATEST_CFA = defExistingVar("LATEST", LATEST)
-PSP0_CFA = defExistingVar("PSP0", PSP0)
-RSP0_CFA = defExistingVar("RSP0", RSP0)
-STATE, STATE_CFA = defNewVar("STATE", 0)
-BASE, BASE_CFA = defNewVar("BASE", 10)
-
-# Constants
-
-defConst("DOCOL", DOCOL)
-defConst("DOCON", DOCON)
-defConst("DOVAR", DOVAR)
-
-defConst("DICT", DICT)
-
-F_IMMED = defConst("F_IMMED", 128)
-F_HIDDEN = defConst("F_HIDDEN", 256)
-F_LENMASK = defConst("F_LENMASK", 127)
-
 # Return Stack
 
 TOR = defPrimWord(">R", () -> begin
@@ -688,6 +686,7 @@ WORD = defPrimWord("WORD", () -> begin
     return NEXT
 end)
 
+BASE, BASE_CFA = defNewVar("BASE", 10)
 NUMBER = defPrimWord("NUMBER", () -> begin
 
     wordLen = popPS()
@@ -788,6 +787,8 @@ COMMA = defPrimWord(",", () -> begin
     return NEXT
 end)
 
+STATE, STATE_CFA = defNewVar("STATE", 0)
+
 LBRAC = defPrimWord("[", () -> begin
     mem[STATE] = 0
     return NEXT
-- 
2.20.1