Builtin abs() (#458)

vtereshkov · Dec 7, 2024 · 938eea7 · 938eea7
1 parent c16dc53
commit 938eea7
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 7 deletions.
diff --git a/Umka.sublime-syntax b/Umka.sublime-syntax
@@ -5,7 +5,7 @@ file_extensions:
   - um
 scope: source.umka
 variables:
-  builtin: (append|atan|atan2|cap|ceil|copy|cos|delete|exit|exp|fabs|floor|fprintf|fscanf|insert|keys|len|log|make|memusage|new|printf|resume|round|scanf|selfhasptr|selftypeeq|sin|sizeof|sizeofself|slice|sort|sprintf|sqrt|sscanf|trunc|typeptr|valid|validkey)
+  builtin: (abs|append|atan|atan2|cap|ceil|copy|cos|delete|exit|exp|fabs|floor|fprintf|fscanf|insert|keys|len|log|make|memusage|new|printf|resume|round|scanf|selfhasptr|selftypeeq|sin|sizeof|sizeofself|slice|sort|sprintf|sqrt|sscanf|trunc|typeptr|valid|validkey)
   ident: '[A-Za-z_][A-Za-z_0-9]*'
   typeident: '_*[A-Z][A-Za-z_0-9]*'
   space: '\s*'

diff --git a/doc/lang.md b/doc/lang.md
@@ -683,6 +683,7 @@ fn round(x: real): int          // Rounding to the nearest integer
 fn trunc(x: real): int          // Rounding towards zero
 fn ceil (x: real): int          // Rounding upwards
 fn floor(x: real): int          // Rounding downwards
+fn abs (x: int): int            // Absolute value
 fn fabs (x: real): real         // Absolute value
 fn sqrt (x: real): real         // Square root
 fn sin  (x: real): real         // Sine

diff --git a/playground/umka.js b/playground/umka.js
diff --git a/src/umka_compiler.c b/src/umka_compiler.c
@@ -128,6 +128,7 @@ static void compilerDeclareBuiltinIdents(Compiler *comp)
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "trunc",      comp->intType,     BUILTIN_TRUNC);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "ceil",       comp->intType,     BUILTIN_CEIL);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "floor",      comp->intType,     BUILTIN_FLOOR);
+    identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "abs",        comp->intType,     BUILTIN_ABS);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "fabs",       comp->realType,    BUILTIN_FABS);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "sqrt",       comp->realType,    BUILTIN_SQRT);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "sin",        comp->realType,    BUILTIN_SIN);

diff --git a/src/umka_const.c b/src/umka_const.c
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <limits.h>
 #include <math.h>
+#include <inttypes.h>
 
 #include "umka_const.h"
 
@@ -230,6 +231,13 @@ void constCallBuiltin(Consts *consts, Const *arg, const Const *arg2, TypeKind ar
         case BUILTIN_TRUNC:     arg->intVal  = (int64_t)trunc(arg->realVal); break;
         case BUILTIN_CEIL:      arg->intVal  = (int64_t)ceil (arg->realVal); break;
         case BUILTIN_FLOOR:     arg->intVal  = (int64_t)floor(arg->realVal); break;
+        case BUILTIN_ABS:
+        {
+            if (arg->intVal == LLONG_MIN)
+                consts->error->handler(consts->error->context, "abs() domain error");
+            arg->intVal = llabs(arg->intVal);
+            break;
+        }
         case BUILTIN_FABS:      arg->realVal = fabs(arg->realVal); break;
         case BUILTIN_SQRT:
         {

diff --git a/src/umka_expr.c b/src/umka_expr.c
@@ -833,9 +833,11 @@ static void parseBuiltinIOCall(Compiler *comp, Type **type, Const *constant, Bui
 
 static void parseBuiltinMathCall(Compiler *comp, Type **type, Const *constant, BuiltinFunc builtin)
 {
-    *type = comp->realType;
+    Type *argType = (builtin == BUILTIN_ABS) ? comp->intType : comp->realType;
+
+    *type = argType;
     parseExpr(comp, type, constant);
-    doAssertImplicitTypeConv(comp, comp->realType, type, constant);
+    doAssertImplicitTypeConv(comp, argType, type, constant);
 
     Const constant2Val = {.realVal = 0};
     Const *constant2 = NULL;
@@ -854,11 +856,11 @@ static void parseBuiltinMathCall(Compiler *comp, Type **type, Const *constant, B
     }
 
     if (constant)
-        constCallBuiltin(&comp->consts, constant, constant2, TYPE_REAL, builtin);
+        constCallBuiltin(&comp->consts, constant, constant2, argType->kind, builtin);
     else
-        genCallBuiltin(&comp->gen, TYPE_REAL, builtin);
+        genCallBuiltin(&comp->gen, argType->kind, builtin);
 
-    if (builtin == BUILTIN_ROUND || builtin == BUILTIN_TRUNC || builtin == BUILTIN_CEIL || builtin == BUILTIN_FLOOR)
+    if (builtin == BUILTIN_ROUND || builtin == BUILTIN_TRUNC || builtin == BUILTIN_CEIL || builtin == BUILTIN_FLOOR || builtin == BUILTIN_ABS)
         *type = comp->intType;
     else
         *type = comp->realType;
@@ -1515,6 +1517,7 @@ static void parseBuiltinCall(Compiler *comp, Type **type, Const *constant, Built
         case BUILTIN_TRUNC:
         case BUILTIN_CEIL:
         case BUILTIN_FLOOR:
+        case BUILTIN_ABS:
         case BUILTIN_FABS:
         case BUILTIN_SQRT:
         case BUILTIN_SIN:

diff --git a/src/umka_gen.c b/src/umka_gen.c
@@ -388,6 +388,12 @@ static bool optimizeCallBuiltin(CodeGen *gen, TypeKind typeKind, BuiltinFunc bui
                 }
                 break;
             }
+            case BUILTIN_ABS:
+            {
+                arg.intVal = prev->operand.intVal;
+                resultTypeKind = TYPE_INT;
+                break;
+            }
             case BUILTIN_ROUND:
             case BUILTIN_TRUNC:
             case BUILTIN_CEIL:

diff --git a/src/umka_vm.c b/src/umka_vm.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <limits.h>
 #include <ctype.h>
+#include <inttypes.h>
 
 #include "umka_vm.h"
 
@@ -112,6 +113,7 @@ static const char *builtinSpelling [] =
     "trunc",
     "ceil",
     "floor",
+    "abs",
     "fabs",
     "sqrt",
     "sin",
@@ -3550,6 +3552,13 @@ static FORCE_INLINE void doCallBuiltin(Fiber *fiber, Fiber **newFiber, HeapPages
         case BUILTIN_TRUNC:         fiber->top->intVal = (int64_t)trunc(fiber->top->realVal); break;
         case BUILTIN_CEIL:          fiber->top->intVal = (int64_t)ceil (fiber->top->realVal); break;
         case BUILTIN_FLOOR:         fiber->top->intVal = (int64_t)floor(fiber->top->realVal); break;
+        case BUILTIN_ABS:
+        {
+            if (fiber->top->intVal == LLONG_MIN)
+                error->runtimeHandler(error->context, ERR_RUNTIME, "abs() domain error");
+            fiber->top->intVal = llabs(fiber->top->intVal);
+            break;
+        }
         case BUILTIN_FABS:          fiber->top->realVal = fabs(fiber->top->realVal); break;
         case BUILTIN_SQRT:
         {

diff --git a/src/umka_vm.h b/src/umka_vm.h
@@ -102,6 +102,7 @@ typedef enum
     BUILTIN_TRUNC,
     BUILTIN_CEIL,
     BUILTIN_FLOOR,
+    BUILTIN_ABS,
     BUILTIN_FABS,
     BUILTIN_SQRT,
     BUILTIN_SIN,