Skip to content

Commit

Permalink
update math evaluator
Browse files Browse the repository at this point in the history 
Signed-off-by: George Lemon <[email protected]>
  • Loading branch information
@georgelemon
georgelemon committed Aug 21, 2023
1 parent ae82117 commit a68b29e
Showing 1 changed file with 192 additions and 20 deletions.
212 changes: 192 additions & 20 deletions src/bropkg/engine/compiler.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,6 @@ proc divide(lht, rht: int): float {.inline.} = lht / rht
proc divide(lht, rht: float): float {.inline.} = lht / rht
proc modulo(lht, rht: int): int {.inline.} = lht mod rht

template ofMathCallStack(): untyped {.dirty.} =
var rht = handleCallStack(c, rht, scope)
c.evalMathInfix(lht, rht, infixOp, scope)

template calc(calcHandle): untyped {.dirty.} =
case lht.nt
Expand All @@ -321,13 +318,12 @@ template calc(calcHandle): untyped {.dirty.} =
Node(nt: ntInt, iVal: int(x))
of ntFloat:
Node(nt: ntFloat, fVal: calcHandle(toFloat(lht.iVal), rht.fVal))
of ntCall:
of ntCall, ntCallFunction:
var rht = c.nodeEvaluator(rht, scope)
c.mathEvaluator(lht, rht, infixOp, scope)
of ntMathStmt:
var rht = c.mathEvaluator(rht.mathLeft, rht.mathRight, rht.mathInfixOp, scope)
c.mathEvaluator(lht, rht, infixOp, scope)
# of ntCallFunction: ofMathCallStack
else: nil
of ntFloat:
case rht.nt:
Expand All @@ -339,7 +335,7 @@ template calc(calcHandle): untyped {.dirty.} =
Node(nt: ntInt, iVal: int(x))
of ntFloat:
Node(nt: ntFloat, fVal: calcHandle(lht.fVal, rht.fVal))
of ntCall:
of ntCall, ntCallFunction:
var rht = c.nodeEvaluator(rht, scope)
c.mathEvaluator(lht, rht, infixOp, scope)
of ntMathStmt:
Expand Down Expand Up @@ -368,23 +364,27 @@ template calc(calcHandle): untyped {.dirty.} =
else: nil
else: nil # todo handle int/float callables
else: nil
of ntCall:
of ntCall, ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
if lht.nt == ntMathStmt:
lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
case rht.nt:
of ntInt, ntFloat:
c.mathEvaluator(lht, rht, infixOp, scope)
of ntCall:
of ntCall, ntCallFunction:
var rht = c.nodeEvaluator(rht, scope)
c.mathEvaluator(lht, rht, infixOp, scope)
# of ntCallFunction: ofMathCallStack
else: nil
of ntMathStmt:
var lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
var rht = rht
case rht.nt
of ntMathStmt:
rht = c.mathEvaluator(rht.mathLeft, rht.mathRight, rht.mathInfixOp, scope)
else: discard
c.mathEvaluator(lht, rht, infixOp, scope)
else:
nil # todo handle function calls
else: nil

proc mathEvaluator*(c: Compiler, lht, rht: Node, infixOp: MathOp, scope: var seq[ScopeTable]): Node =
case infixOp
Expand Down Expand Up @@ -433,6 +433,12 @@ template caseSizeBody {.dirty.} =
else:
return false

template caseLhtCallBody {.dirty.} =
var lht = c.nodeEvaluator(lht, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
return false

proc infixEvaluator(c: Compiler, lht, rht: Node, op: InfixOp, scope: var seq[ScopeTable]): bool =
case op
of EQ:
Expand All @@ -451,20 +457,13 @@ proc infixEvaluator(c: Compiler, lht, rht: Node, op: InfixOp, scope: var seq[Sco
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntCall:
var lht = c.nodeEvaluator(lht, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
of ntCall: caseLhtCallBody
of ntBool:
case rht.nt
of ntBool: lht.bVal == rht.bVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntColor:
# echo lht.cValue.toHtmlRgb
# echo rht.cValue.toHtmlRgb
case rht.nt
of ntColor: lht.cValue == rht.cValue
else: printTypeMismatch
Expand All @@ -484,8 +483,7 @@ proc infixEvaluator(c: Compiler, lht, rht: Node, op: InfixOp, scope: var seq[Sco
of ntObject: lht.toString == rht.toString
of ntCall: caseCallStorageBody
else: printTypeMismatch
of ntSize:
caseSizeBody
of ntSize: caseSizeBody
of ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
var rht = rht
Expand All @@ -501,6 +499,180 @@ proc infixEvaluator(c: Compiler, lht, rht: Node, op: InfixOp, scope: var seq[Sco
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
of NE:
case lht.nt
of ntInt:
case rht.nt
of ntInt: lht.iVal != rht.iVal
of ntFloat: lht.iVal.toFloat != rht.fVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntFloat:
case rht.nt:
of ntFloat: lht.fVal != rht.fVal
of ntInt: lht.fVal != rht.iVal.toFloat
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntCall: caseLhtCallBody
of ntBool:
case rht.nt
of ntBool: lht.bVal != rht.bVal
of ntCall: caseCallBody
else: printTypeMismatch
of ntColor:
case rht.nt
of ntColor: lht.cValue != rht.cValue
else: printTypeMismatch
of ntString:
case rht.nt
of ntString: lht.sVal != rht.sVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntArray:
case rht.nt
of ntArray: lht.toString != rht.toString
of ntCall: caseCallStorageBody
else: printTypeMismatch
of ntObject:
case rht.nt
of ntObject: lht.toString != rht.toString
of ntCall: caseCallStorageBody
else: printTypeMismatch
of ntSize: caseSizeBody
of ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
var rht = rht
if rht.nt == ntCallFunction:
rht = c.nodeEvaluator(rht, scope)
return c.infixEvaluator(lht, rht, op, scope)
of ntStream:
case rht.nt
of ntStream: lht.toString != rht.toString
else: printTypeMismatch
else:
var lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
of GT:
case lht.nt
of ntInt:
case rht.nt
of ntInt: lht.iVal > rht.iVal
of ntFloat: lht.iVal.toFloat > rht.fVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntFloat:
case rht.nt:
of ntFloat: lht.fVal > rht.fVal
of ntInt: lht.fVal > rht.iVal.toFloat
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntCall: caseLhtCallBody
of ntSize: caseSizeBody
of ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
var rht = rht
if rht.nt == ntCallFunction:
rht = c.nodeEvaluator(rht, scope)
return c.infixEvaluator(lht, rht, op, scope)
else:
var lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
of GTE:
case lht.nt
of ntInt:
case rht.nt
of ntInt: lht.iVal >= rht.iVal
of ntFloat: lht.iVal.toFloat >= rht.fVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntFloat:
case rht.nt:
of ntFloat: lht.fVal >= rht.fVal
of ntInt: lht.fVal >= rht.iVal.toFloat
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntCall: caseLhtCallBody
of ntSize: caseSizeBody
of ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
var rht = rht
if rht.nt == ntCallFunction:
rht = c.nodeEvaluator(rht, scope)
return c.infixEvaluator(lht, rht, op, scope)
else:
var lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
of LT:
case lht.nt
of ntInt:
case rht.nt
of ntInt: lht.iVal < rht.iVal
of ntFloat: lht.iVal.toFloat < rht.fVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntFloat:
case rht.nt:
of ntFloat: lht.fVal < rht.fVal
of ntInt: lht.fVal < rht.iVal.toFloat
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntCall: caseLhtCallBody
of ntSize: caseSizeBody
of ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
var rht = rht
if rht.nt == ntCallFunction:
rht = c.nodeEvaluator(rht, scope)
return c.infixEvaluator(lht, rht, op, scope)
else:
var lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
of LTE:
case lht.nt
of ntInt:
case rht.nt
of ntInt: lht.iVal <= rht.iVal
of ntFloat: lht.iVal.toFloat <= rht.fVal
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntFloat:
case rht.nt:
of ntFloat: lht.fVal <= rht.fVal
of ntInt: lht.fVal <= rht.iVal.toFloat
of ntCall: caseCallBody
of ntMathStmt: caseMathBody
else: printTypeMismatch
of ntCall: caseLhtCallBody
of ntSize: caseSizeBody
of ntCallFunction:
var lht = c.nodeEvaluator(lht, scope)
var rht = rht
if rht.nt == ntCallFunction:
rht = c.nodeEvaluator(rht, scope)
return c.infixEvaluator(lht, rht, op, scope)
else:
var lht = c.mathEvaluator(lht.mathLeft, lht.mathRight, lht.mathInfixOp, scope)
if likely(lht != nil):
return c.infixEvaluator(lht, rht, op, scope)
false
else:
false

Expand Down

0 comments on commit a68b29e

Please sign in to comment.