diff options
Diffstat (limited to 'source/parse.cpp')
| -rw-r--r-- | source/parse.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/source/parse.cpp b/source/parse.cpp index 27c514d..6e1d2bf 100644 --- a/source/parse.cpp +++ b/source/parse.cpp @@ -1,5 +1,5 @@ // sprit-forth: A portable subroutine-threaded Forth. -// Copyright (C) 2023 Clyne Sullivan <clyne@bitgloo.com> +// Copyright (C) 2024 Clyne Sullivan <clyne@bitgloo.com> // // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Library General Public License as published by @@ -16,6 +16,7 @@ // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. #include "core.hpp" +#include "executor.hpp" #include "state.hpp" #include "types.hpp" @@ -34,16 +35,16 @@ static Error parseword(const char *start, const char *end) auto result = Error::none; if (start != end) { - if (auto word = find(start, end - start); word) { - if (!word->immediate() && STATE) { + if (auto word = Forth.find(start, end - start); word) { + if (!word->immediate() && Forth.state) { comma((Cell)word->list); } else { - result = execute1(word); + result = Exec.execute1(word); } } else if (isdigit(*start) || (*start == '-' && isdigit(*(start + 1)))) { - push(std::atoi(start)); + Forth.push(std::atoi(start)); - if (STATE) + if (Forth.state) compileliteral(); } else if (findword(start, end - start)) { return Error::noword; @@ -57,11 +58,11 @@ static Error parseword(const char *start, const char *end) static Error parseSource() { auto result = Error::none; - char *start = (char *)DICT[DIdxSource]; + char *start = (char *)Forth.source; char *end = start; - auto& i = *((char *)&DICT[DIdxInBuf]); + auto& i = *((char *)&Forth.sourcei); - while (result == Error::none && i < DICT[DIdxSrcLen]) { + while (result == Error::none && i < Forth.sourceu) { if (isspace(*end) || *end == '\0') { if (end - start < 1) { start = ++end; @@ -69,7 +70,7 @@ static Error parseSource() } else { ++i; // discard the space result = parseword(start, end); - start = (char *)DICT[DIdxSource] + i; + start = (char *)Forth.source + i; end = start; } } else { @@ -85,9 +86,9 @@ static Error parseSource() Error parse() { // Reset source buffer and try to fill it with getinput(). - DICT[DIdxSource] = (Cell)&DICT[DIdxInBuf] + 1; - DICT[DIdxSrcLen] = 0; - *((char *)&DICT[DIdxInBuf]) = 0; + Forth.source = (Cell)&Forth.sourcei + 1; + Forth.sourceu = 0; + Forth.sourcei = 0; getinput(); addkey('\0'); |