diff options
Diffstat (limited to 'libalee')
| -rw-r--r-- | libalee/corewords.hpp | 7 | ||||
| -rw-r--r-- | libalee/ctype.hpp | 6 | ||||
| -rw-r--r-- | libalee/dictionary.cpp | 2 | ||||
| -rw-r--r-- | libalee/parser.cpp | 7 | ||||
| -rw-r--r-- | libalee/state.cpp | 1 |
5 files changed, 11 insertions, 12 deletions
diff --git a/libalee/corewords.hpp b/libalee/corewords.hpp index 25f6a6e..d5c35ea 100644 --- a/libalee/corewords.hpp +++ b/libalee/corewords.hpp @@ -19,11 +19,10 @@ #ifndef ALEEFORTH_COREWORDS_HPP #define ALEEFORTH_COREWORDS_HPP +#include "ctype.hpp" #include "types.hpp" #include "state.hpp" -#include <cstring> - /** * To be implemented by the user, this function is called when the `sys` word * is executed. @@ -42,7 +41,7 @@ public: */ static Cell findi(State&, Word); consteval static Cell findi(const char *word) { - return findi(word, std::strlen(word)); + return findi(word, strlen(word)); } /** @@ -67,7 +66,7 @@ private: const char *ptr = CoreWords::wordsarr; for (Cell wordsi = 0; wordsi < WordCount; ++wordsi) { - std::size_t wordsize = std::strlen(ptr); + std::size_t wordsize = strlen(ptr); if (wordsize == size && Dictionary::equal(ptr, ptr + wordsize, it)) return wordsi; diff --git a/libalee/ctype.hpp b/libalee/ctype.hpp index 878c747..499a90f 100644 --- a/libalee/ctype.hpp +++ b/libalee/ctype.hpp @@ -25,6 +25,12 @@ #include <cstdint> +constexpr inline unsigned strlen(const char * const s) { + unsigned i = 0; + while (s[i]) i++; + return i; +} + constexpr inline bool isspace(uint8_t c) { return c == ' ' || c == '\t' || c == '\r' || c == '\n'; } diff --git a/libalee/dictionary.cpp b/libalee/dictionary.cpp index 6c359bd..a86531d 100644 --- a/libalee/dictionary.cpp +++ b/libalee/dictionary.cpp @@ -18,8 +18,6 @@ #include "dictionary.hpp" -#include <cstring> - void Dictionary::initialize() { write(Base, 10); diff --git a/libalee/parser.cpp b/libalee/parser.cpp index 3236ae2..19aa5f7 100644 --- a/libalee/parser.cpp +++ b/libalee/parser.cpp @@ -20,16 +20,13 @@ #include "ctype.hpp" #include "parser.hpp" -#include <algorithm> -#include <cstring> - Error (*Parser::customParse)(State&, Word) = nullptr; Error Parser::parse(State& state, const char *str) { auto addr = Dictionary::Input; - const auto len = static_cast<Cell>(std::strlen(str)); + const auto len = static_cast<Cell>(strlen(str)); state.dict.write(addr, 0); state.dict.write(Dictionary::SourceLen, len); @@ -95,7 +92,7 @@ Error Parser::parseNumber(State& state, Word word) ++it; const auto end = word.end(&state.dict); - for (char c; it != end; ++it) { + for (uint8_t c; it != end; ++it) { c = *it; if (isdigit(c)) { diff --git a/libalee/state.cpp b/libalee/state.cpp index 6e12999..df785e0 100644 --- a/libalee/state.cpp +++ b/libalee/state.cpp @@ -19,7 +19,6 @@ #include "corewords.hpp" #include "state.hpp" -#include <cstring> #include <iterator> bool State::compiling() const |