From d2126fe52fd3c002631e66fa7d6e2d5cd8862bea Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Thu, 13 Apr 2017 21:51:54 +0200 Subject: Implement deferred word, conditional resolution Due to the non-trivial way tokens were previously processed the compiler could not safely perform tail-call elimination. Thus the _slang_ evaluation depth was restricted by the maximum call stack size. This issue is mitigated by introducing deferred word resolution - i.e. pushing expanded tokens onto a buffer stack and processing them in an explicit loop. This change ties into the implementation of the language's conditional primitive. The previous implementation did implicitly not support direct nesting of conditional expressions such as: truthA if mainBranch truthB if secondaryMainBranch then else then alternativeBranch else This issue is now made explicit by disallowing direct nesting of conditionals as depicted above. Appropriate exceptions are generated when required and the conditional primitive is reimplemented in a more robust fashion under the assumption that this rule holds. Note that nesting is still fully supported iff. the nested conditional is contained in a deferredly evaluated word. As a positive side effect this will make it slightly harder to generate unreadable code by forcing developers to write simpler words. The main change of the conditional primitive lies in deferring branch token processing until the conditional expression is concluded by `else`. This is achieved by capturing non-dropped tokens in an internal buffer akin to how the word definition operator `ยง` is implemented. The branch buffer is discharged after `else` is evaluated. Discharging is triggered via the newly introduced `result` method of the primitive evaluation module. This avenue for injecting tokens into the processing stream may be used by further primitives in the future. --- src/stack.d | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/stack.d') diff --git a/src/stack.d b/src/stack.d index 2fb602b..678f3e8 100644 --- a/src/stack.d +++ b/src/stack.d @@ -1,7 +1,8 @@ module src.stack; -import std.variant; +import std.conv; import std.string; +import std.variant; import std.container : SList; static import src.definition; @@ -11,6 +12,14 @@ 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"); -- cgit v1.2.3