Removes needless linking on hklmath

lavignes · Dec 4, 2012 · 4b1e19a · 4b1e19a
1 parent 3b8e72c
commit 4b1e19a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -36,10 +36,8 @@ statement/hklr_statement_while.c \
 linenoise/linenoise.c
 
 math_SOURCES = module/math.c
-math_SOURCES += hklr.c hkl_value.c hklr_expression.c
+math_SOURCES += hkl_value.c
 math_LDFLAGS = -shared -nostartfiles
 math_LDADD = -lm
 math_CFLAGS = $(AM_CFLAGS)
-math_CFLAGS +=  -fPIC
-
-
+math_CFLAGS +=  -fPIC
diff --git a/src/math b/src/math
diff --git a/src/module/math.c b/src/module/math.c
@@ -3,7 +3,6 @@
 #include <math.h>
 
 #include "hkl_value.h"
-#include "hklr_expression.h"
 
 double hklapi_PI = 3.1415926;
 double hklapi_TAU = 2.0*3.1415926;
@@ -58,6 +57,15 @@ HklValue* hklapi_log10(HklList* args) {
   return hkl_value_new(HKL_TYPE_REAL, log10(d));
 }
 
+HklValue* hklapi_sqrt(HklList* args) {
+
+  HklValue* value = args->head->data;
+  double d = value->as.real;
+  hkl_value_free(value);
+
+  return hkl_value_new(HKL_TYPE_REAL, sqrt(d));
+}
+
 HklValue* hklapi_pow(HklList* args) {
 
   HklValue* value = args->head->data;

diff --git a/src/module/math.hkl b/src/module/math.hkl
@@ -7,6 +7,7 @@ Math = interface "src/math"
   tan: cfunc
   log: cfunc
   log10: cfunc
+  sqrt: cfunc
   pow: cfunc
 
 end