From 8061fdc54d0b313036dd0e48f4d777f404afb15f Mon Sep 17 00:00:00 2001
From: Val Erastov <xibyte@gmail.com>
Date: Mon, 22 Aug 2022 19:54:06 -0700
Subject: [PATCH] fix expression evaluation

---
 web/app/cad/expressions/expressionsBundle.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/app/cad/expressions/expressionsBundle.ts b/web/app/cad/expressions/expressionsBundle.ts
index bafbb09d..a7985780 100644
--- a/web/app/cad/expressions/expressionsBundle.ts
+++ b/web/app/cad/expressions/expressionsBundle.ts
@@ -31,10 +31,7 @@ export function activate(ctx: ApplicationContext) {
     }
     let value = table$.value[expr];
     if (value === undefined) {
-      value = parseFloat(expr);
-      if (isNaN(value)) {
-        value = _evaluateExpression(expr);
-      }
+      value = _evaluateExpression(expr);
     }
     return value;
   }
@@ -58,6 +55,8 @@ export function activate(ctx: ApplicationContext) {
   };
 
   table$.attach(() => ctx.expressionService.signature = Date.now() + '');
+
+  load('');
 }
 
 function rebuildVariableTable(script) {