From 44f419264898f84fe5536f3ea159c18b381e6083 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sun, 16 Apr 2017 13:17:22 +0200 Subject: Extract variable management, move into `state` package --- source/base/definition.d | 84 ------------------------------------------------ source/base/stack.d | 48 --------------------------- 2 files changed, 132 deletions(-) delete mode 100644 source/base/definition.d delete mode 100644 source/base/stack.d (limited to 'source/base') diff --git a/source/base/definition.d b/source/base/definition.d deleted file mode 100644 index d37ad20..0000000 --- a/source/base/definition.d +++ /dev/null @@ -1,84 +0,0 @@ -module base.definition; - -import std.string; -import std.variant; -import std.typecons; - -import std.container : DList; - -import base.stack; - -alias Words = Stack!Token[string]; - -Words words; - -bool handle(Token token) { - return token.visit!( - (int value) => handle(value), - (bool value) => handle(value), - (string word ) => handle(word) - ); -} - -Stack!Token get(string word) { - if ( word in words ) { - return words[word].dup; - } else { - return Stack!Token(Token(word)); - } -} - -private { - -Nullable!(DList!Token) definition; - -void register(DList!Token definition) { - string wordToBeDefined; - - definition.front.visit!( - (int value) => wordToBeDefined = "", - (bool value) => wordToBeDefined = "", - (string name ) => wordToBeDefined = name - ); - - if ( wordToBeDefined == "" ) { - throw new Exception("words may not be numeric or boolean"); - } - - definition.removeFront; - words[wordToBeDefined] = Stack!Token(definition[]); -} - -template handle(T) -if ( is(T == int) || is(T == bool) ) { - bool handle(T value) { - if ( definition.isNull ) { - return false; - } else { - definition.insertBack(Token(value)); - return true; - } - } -} - -bool handle(string word) { - if ( definition.isNull ) { - if ( word == "ยง" ) { - definition = DList!Token(); - return true; - } else { - return false; - } - } else { - if ( word == ";" ) { - register(definition); - definition.nullify; - } else { - definition.insertBack(Token(word)); - } - - return true; - } -} - -} diff --git a/source/base/stack.d b/source/base/stack.d deleted file mode 100644 index c6e1a59..0000000 --- a/source/base/stack.d +++ /dev/null @@ -1,48 +0,0 @@ -module base.stack; - -import std.conv; -import std.string; -import std.variant; -import std.container : SList; - -alias Token = Algebraic!(int, bool, string); -alias Stack = SList; - -Stack!Token stack; - -Token toToken(string value) { - if ( value.isNumeric ) { - return Token(parse!int(value)); - } else { - return Token(value); - } -} - -Token top(ref Stack!Token stack) { - if ( stack.empty ) { - throw new Exception("stack is empty"); - } else { - return stack.front; - } -} - -Token pop(ref Stack!Token stack) { - Token token = stack.top; - stack.removeFront; - return token; -} - -template push(T) -if ( is(T == int) || is(T == bool) || is (T == string) ) { - void push(ref Stack!Token stack, T value) { - stack.push(Token(value)); - } -} - -void push(ref Stack!Token stack, Token token) { - stack.insertFront(token); -} - -void push(ref Stack!Token stack, Stack!Token prefix) { - stack.insertFront(prefix[]); -} -- cgit v1.2.3