sforman
/
Thun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nimpretty reformat. Two-space indentation.

This commit is contained in:
Simon Forman 2022-09-14 09:49:33 -07:00
parent 6b07d7d30b
commit 6eb71b3c6e
1 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
implementations/Nim/simplejoy.nim
View File

@ -171,9 +171,9 @@ proc text_to_expression(text: string): JoyType =
:rtype: stack :rtype: stack
:raises ParseError: if the parse fails. :raises ParseError: if the parse fails.
]# ]#
var frame : seq[JoyType] = @[] var frame: seq[JoyType] = @[]
var stack : seq[seq[JoyType]] = @[] var stack: seq[seq[JoyType]] = @[]
var thing : JoyType var thing: JoyType
for tok in text.replace("[", " [ ").replace("]", " ] ").splitWhitespace(): for tok in text.replace("[", " [ ").replace("]", " ] ").splitWhitespace():
@ -242,7 +242,8 @@ proc print_stack*(stack: JoyListType): string =
# ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═════╝ ╚═╝╚═╝ ╚═══╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝ # ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═════╝ ╚═╝╚═╝ ╚═══╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝
proc branch(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (JoyListType, JoyType, JoyMapType) = proc branch(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (
JoyListType, JoyType, JoyMapType) =
let (true_body, s0) = pop_list(stack) let (true_body, s0) = pop_list(stack)
let (false_body, s1) = pop_list(s0) let (false_body, s1) = pop_list(s0)
let (flag, s2) = pop_bool(s1) let (flag, s2) = pop_bool(s1)
@ -253,11 +254,13 @@ proc branch(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (J
# re-wrap one of them in a joytype wrapper. # re-wrap one of them in a joytype wrapper.
proc clear(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (JoyListType, JoyType, JoyMapType) = proc clear(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (
JoyListType, JoyType, JoyMapType) =
return (empty_list.listVal, expression, dictionary) return (empty_list.listVal, expression, dictionary)
proc concat(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (JoyListType, JoyType, JoyMapType) = proc concat(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (
JoyListType, JoyType, JoyMapType) =
let (tos, s0) = pop_list(stack) let (tos, s0) = pop_list(stack)
let (second, s1) = pop_list(s0) let (second, s1) = pop_list(s0)
return (push_list((second ++ tos), s1), expression, dictionary) return (push_list((second ++ tos), s1), expression, dictionary)
@ -276,7 +279,8 @@ proc concat(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (J
# it looks up in the dictionary. # it looks up in the dictionary.
proc joy_eval(sym: string, stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (JoyListType, JoyType, JoyMapType) = proc joy_eval(sym: string, stack: JoyListType, expression: JoyType,
dictionary: JoyMapType): (JoyListType, JoyType, JoyMapType) =
case sym case sym
of "add": of "add":
@ -348,11 +352,12 @@ proc joy_eval(sym: string, stack: JoyListType, expression: JoyType, dictionary:
# <> ≡ ne # <> ≡ ne
proc joy(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (JoyListType, JoyMapType) = proc joy(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (
JoyListType, JoyMapType) =
var s = stack var s = stack
var d = dictionary var d = dictionary
var e = push_quote(expression, empty_list) var e = push_quote(expression, empty_list)
var term : JoyType var term: JoyType
while not e.listVal.isEmpty: while not e.listVal.isEmpty:
(term, e) = next_term(e) (term, e) = next_term(e)
@ -373,24 +378,24 @@ proc joy(stack: JoyListType, expression: JoyType, dictionary: JoyMapType): (JoyL
let stack = empty_list.listVal let stack = empty_list.listVal
let dict = newMap[string, JoyListType]() let dict = newMap[string, JoyListType]()
#let exp = text_to_expression("2 3 add 23 mul 45 gt") #let exp = text_to_expression("2 3 add 23 mul 45 gt")
#let exp = text_to_expression("2 3 false [add] [mul] branch") #let exp = text_to_expression("2 3 false [add] [mul] branch")
#let exp = text_to_expression("2 3 true [add] [mul] branch") #let exp = text_to_expression("2 3 true [add] [mul] branch")
#let exp = text_to_expression("[add] [mul] concat") #let exp = text_to_expression("[add] [mul] concat")
#let (s,d) = joy(stack, exp, dict) #let (s,d) = joy(stack, exp, dict)
#echo print_stack(s) #echo print_stack(s)
var s = stack var s = stack
var d = dict var d = dict
var exp : JoyType var exp: JoyType
while true: while true:
try: try:
exp = text_to_expression(readLineFromStdin("joy? ")) exp = text_to_expression(readLineFromStdin("joy? "))
except IOError: except IOError:
break break
try: try:
(s,d) = joy(s, exp, dict) (s, d) = joy(s, exp, dict)
except: except:
echo getCurrentExceptionMsg() echo getCurrentExceptionMsg()
echo print_stack(s) echo print_stack(s)