evaluator: add if and primitives and tests

src/Phsyche.package/Phsyche.class/instance/carBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+carBinding
+	^ #car -> [ :l | l first ]

src/Phsyche.package/Phsyche.class/instance/cdrBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+cdrBinding
+	^ #cdr -> [ :l | l allButFirst ]

src/Phsyche.package/Phsyche.class/instance/consBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+consBinding
+	^ #cons -> [ :e :l | {e} , l ]

src/Phsyche.package/Phsyche.class/instance/divBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+divBinding
+	^ #+ -> [ :e :v | e / v asFloat ]

src/Phsyche.package/Phsyche.class/instance/eval.in..st

@@ -4,6 +4,12 @@ eval: expr in: environ
 	expr isSymbol ifTrue: [ ^ environ at: expr ]. "returns the variable value"
 	expr isArray ifFalse: [ ^ expr ] "returns literals boolean, string, number"
 					 ifTrue: [
-						expr first = #define
-						ifTrue: [ ^ self evalDefine: expr in: environ ]
+						| fst |
+						fst := expr first.
+						(prims includes: fst) ifTrue: [
+							^ self evalPrim: expr in: environ
+						]. "evaluates primitive"
+						fst = #define ifTrue: [ ^ self evalDefine: expr in: environ ]. "defines the value"
+						fst = #if ifTrue: [ ^ self evalIf: expr in: environ]. "evaluates if"
+						fst = #quote ifTrue: [ ^ expr second ]. "returns the value unevaluated"
 					]

src/Phsyche.package/Phsyche.class/instance/evalIf.in..st

@@ -0,0 +1,5 @@
+as yet unclassified
+evalIf: expr in: environ
+	^ (self eval: expr second in: environ)
+		ifTrue: [ self eval: expr third in: environ ]
+		ifFalse: [ self eval: expr fourth in: environ ]

src/Phsyche.package/Phsyche.class/instance/evalPrim.in..st

@@ -0,0 +1,5 @@
+as yet unclassified
+evalPrim: expr in: environ
+	| method |
+	method := (environ at: expr first).
+	^ method valueWithArguments: (expr allButFirst collect: [ :x | self eval: x in: environ])

src/Phsyche.package/Phsyche.class/instance/greaterBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+greaterBinding
+	^ #> -> [ :e :v | e > v ]

src/Phsyche.package/Phsyche.class/instance/greaterOrEqualBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+greaterOrEqualBinding
+	^ #>= -> [ :e :v | e >= v ]

src/Phsyche.package/Phsyche.class/instance/initialize.st

@@ -1,4 +1,6 @@
 initialization
 initialize
 	super initialize.
-	env := Dictionary new
+	env := Dictionary new.
+	prims := OrderedCollection new.
+	self initializeEnvBindings

src/Phsyche.package/Phsyche.class/instance/initializeEnvBindings.st

@@ -0,0 +1,9 @@
+as yet unclassified
+initializeEnvBindings
+	(self class selectors select: [ :each | each endsWithSubCollection: 'Binding' ])
+		do: [ :s |
+				| binding |
+				binding := self perform: s.
+				prims add: binding key.
+				env at: binding key put: binding value
+			 ]

src/Phsyche.package/Phsyche.class/instance/isEqualBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+isEqualBinding
+	^ #equal -> [ :e :v | e = v ]

src/Phsyche.package/Phsyche.class/instance/isNotBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+isNotBinding
+	^ #not -> [ :a | a not ]

src/Phsyche.package/Phsyche.class/instance/isNullBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+isNullBinding
+	^ #isNull -> [ :l | l = #() ]

src/Phsyche.package/Phsyche.class/instance/minusBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+minusBinding
+	^ #+ -> [ :e :v | e - v ]

src/Phsyche.package/Phsyche.class/instance/multBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+multBinding
+	^ #* -> [ :e :v | e * v ]

src/Phsyche.package/Phsyche.class/instance/plusBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+plusBinding
+	^ #+ -> [ :e :v | e + v ]

src/Phsyche.package/Phsyche.class/instance/smallerOrEqualBinding.st

@@ -0,0 +1,3 @@
+as yet unclassified
+smallerOrEqualBinding
+	^ #<= -> [ :e :v | e <= v ]

src/Phsyche.package/Phsyche.class/properties.json

@@ -6,7 +6,8 @@
 		 ],
 	"commentStamp" : "VeitHeller 4/30/2018 16:32",
 	"instvars" : [
-		"env" ],
+		"env",
+		"prims" ],
 	"name" : "Phsyche",
 	"pools" : [
 		 ],

src/Phsyche.package/PhsycheTest.class/instance/testEvalCarExpressionEvaluatesItsArgument.st

@@ -0,0 +1,5 @@
+tests
+testEvalCarExpressionEvaluatesItsArgument
+	self
+		assert: (ph parseAndEval: '(car (cons (quote a) (cons (quote b)	())))')
+		equals: #a

src/Phsyche.package/PhsycheTest.class/instance/testEvalCdrExpressionEvaluatesItsArgument.st

@@ -0,0 +1,3 @@
+tests
+testEvalCdrExpressionEvaluatesItsArgument
+	self assert: (ph parseAndEval: '(cdr (quote (quote a)))') equals: #(a)

src/Phsyche.package/PhsycheTest.class/instance/testEvalExpressionArith.st

@@ -0,0 +1,4 @@
+tests
+testEvalExpressionArith
+	self assert: (ph parseAndEval: '(* (+ 2 3) 8)') equals: 40.
+	self assert: (ph parseAndEval: '(* 8 (+ 2 3))') equals: 40

src/Phsyche.package/PhsycheTest.class/instance/testEvalExpressionMult.st

@@ -0,0 +1,3 @@
+tests
+testEvalExpressionMult
+	self assert: (ph parseAndEval: '(* 3 8)') equals: 24

src/Phsyche.package/PhsycheTest.class/instance/testEvalIf.st

@@ -0,0 +1,4 @@
+tests
+testEvalIf
+	self assert: (ph parseAndEval: '(if true 4 5)') equals: 4.
+	self assert: (ph parseAndEval: '(if false 4 5)') equals: 5

src/Phsyche.package/PhsycheTest.class/instance/testEvalListExpression.st

@@ -0,0 +1,3 @@
+tests
+testEvalListExpression
+	self assert: (ph parseAndEval: '(cons (quote a) ())') equals: #(a)

src/Phsyche.package/PhsycheTest.class/instance/testEvalQuote.st

@@ -0,0 +1,8 @@
+tests
+testEvalQuote
+	self
+		assert: (ph parseAndEval: '(quote (* x x))')
+		equals: #(#* #x #x).
+	self
+		assert: (ph parseAndEval: '(quote (quote (* x x)))')
+		equals: #(quote #(#* #x #x))

src/Phsyche.package/PhsycheTest.class/instance/testIsNull.st

@@ -0,0 +1,5 @@
+tests
+testIsNull
+	self assert: (ph parseAndEval: '(isNull #())').
+	self assert: (ph parseAndEval: '(isNull (quote ()))').
+	self deny: (ph parseAndEval: '(isNull (cons (quote a) #()))')

src/Phsyche.package/PhsycheTest.class/instance/testNot.st

@@ -0,0 +1,4 @@
+tests
+testNot
+	self assert: (ph parseAndEval: '(not false)').
+	self deny: (ph parseAndEval: '(not true)')