From 241470248b00bbc9aeccf03dfec11ac40b3e78ed Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 24 Feb 2021 20:46:31 -0500 Subject: [PATCH] reorder built-ins a bit --- main.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index f1286d9..f2593ba 100644 --- a/main.go +++ b/main.go @@ -30,9 +30,12 @@ func main() { // word definitions dict.AddWord(":", Word{Name: ":", Impl: b.Colon(&c)}) dict.AddWord(";", Word{Name: ";", Impl: b.Semicolon(&c), Immediate: true}) - // comments + // comments and strings dict.AddWord("(", Word{Name: "(", Impl: b.OpenComment(&c), Immediate: true}) dict.AddWord(")", Word{Name: ")", Impl: b.CloseComment(&c), Immediate: true}) + dict.AddWord(`."`, Word{Name: `."`, Impl: b.OpenQuote(os.Stdout, &rstack, '"')}) + dict.AddWord(`"`, Word{Name: `"`, Impl: b.CloseQuote(&c)}) + dict.AddWord(`.(`, Word{Name: `.(`, Impl: b.OpenQuote(os.Stdout, &rstack, ')'), Immediate: true}) // math dict.AddWord("+", Word{Name: "+", Impl: b.Add(&stack)}) dict.AddWord("-", Word{Name: "-", Impl: b.Sub(&stack)}) @@ -50,10 +53,6 @@ func main() { dict.AddWord(".", Word{Name: ".", Impl: b.Print(os.Stdout, &stack)}) dict.AddWord("EMIT", Word{Name: "EMIT", Impl: b.Emit(os.Stdout, &stack)}) dict.AddWord("CR", Word{Name: "CR", Source: []string{"10", "EMIT"}}) // emit a newline - // strings - dict.AddWord(`."`, Word{Name: `."`, Impl: b.OpenQuote(os.Stdout, &rstack, '"')}) - dict.AddWord(`"`, Word{Name: `"`, Impl: b.CloseQuote(&c)}) - dict.AddWord(`.(`, Word{Name: `.(`, Impl: b.OpenQuote(os.Stdout, &rstack, ')'), Immediate: true}) // logic dict.AddWord("=", Word{Name: "=", Impl: b.Eq(&stack)}) dict.AddWord("0=", Word{Name: "0=", Source: []string{"0", "="}})