Merge pull request 'develop' (#19) from develop into master

Reviewed-on: #19

.gitignore

@@ -3,3 +3,4 @@
 builddir
 *.kb
 *.obk
+!examples/*.obk

examples/multi-fact.obk

@@ -0,0 +1,2 @@
+# this is a comment
+fact("chris cromer" and "martin" and "Isabella" can "program" and "speak english");

examples/obelisk.obk

@@ -0,0 +1,19 @@
+// an incomplete rule, this one stays false
+rule("chris" is "happy" if "chris" plays "playstation");
+
+// a rule that gets inserted as true right away
+fact("this" is "madness");
+rule("this" is "sparta" if "this" is "madness");
+
+// a rule that is inserted as false then updated at a later stage
+rule("bruce" is "batman" if "the waynes" are "dead");
+fact("the waynes" are "dead");
+
+// an action that will be false because the fact doesn't exist, should return ignore
+action(if "tom" is "dangerous" then "avoid" else "ignore");
+
+// an action that will be true, should return die
+action(if "this" is "sparta" then "die" else "live");
+
+fact("what" is "love");
+rule("baby" dont "hurt me" if "what" is "love");

meson.build

@@ -1,7 +1,7 @@
 project('obelisk',
     'c',
     'cpp',
-    version : '1.0.0',
+    version : '1.0.1',
     license : 'BSD-3-Clause',
     default_options : [
         'warning_level=3',
@@ -30,4 +30,5 @@ if docs_enabled
     endif
 endif
 
+subdir('sqlite')
 subdir('src')

sqlite/meson.build

@@ -0,0 +1,20 @@
+sqlite_sources = files(
+    'sqlite3.c'
+)
+
+sqlite_include_directories = include_directories(['.'])
+
+sqlite_args = [
+    '-DSQLITE_OMIT_DESERIALIZE',
+    '-DSQLITE_OMIT_DEPRECATED',
+    '-DSQLITE_OMIT_JSON',
+    '-DSQLITE_OMIT_LOAD_EXTENSION',
+    '-DSQLITE_OMIT_PROGRESS_CALLBACK',
+    '-DSQLITE_DEFAULT_FOREIGN_KEYS=1',
+    '-DSQLITE_DEFAULT_AUTOVACUUM=1',
+    '-DSQLITE_DISABLE_LFS',
+    '-DSQLITE_OMIT_TEMPDB',
+    '-DSQLITE_OMIT_GET_TABLE',
+    '-DSQLITE_OMIT_COMPLETE',
+    '-DSQLITE_OMIT_COMPILEOPTION_DIAGS'
+]

src/lexer.cpp

@@ -56,10 +56,10 @@ int obelisk::Lexer::getToken()
 
         if (getIdentifier() == "extern")
         {
-            return kTokenExtern;
+            return Token::kTokenExtern;
         }
 
-        return kTokenIdentifier;
+        return Token::kTokenIdentifier;
     }
 
     if (isdigit(lastChar))

src/lexer.h

@@ -80,23 +80,27 @@ namespace obelisk
                  * @brief A fact which is a relationship between 2 entities.
                  *
                  */
-                kTokenFact   = -2,
+                kTokenFact = -2,
+
                 /**
                  * @brief A rule which is a relationship between a new fact a
                  * existing fact.
                  *
                  */
-                kTokenRule   = -3,
+                kTokenRule = -3,
+
                 /**
                  * @brief An action to take if a fact is true.
                  *
                  */
                 kTokenAction = -4,
+
                 /**
                  * @brief A definition of a new function.
                  *
                  */
-                kTokenDef    = -5,
+                kTokenDef = -5,
+
                 /**
                  * @brief An external function that will be linked to.
                  *
@@ -108,16 +112,18 @@ namespace obelisk
                  *
                  */
                 kTokenIdentifier = -7,
+
                 /**
                  * @brief A double floating point value.
                  *
                  */
-                kTokenNumber     = -8,
+                kTokenNumber = -8,
+
                 /**
                  * @brief A string.
                  *
                  */
-                kTokenString     = -9
+                kTokenString = -9
             };
 
             /**

src/lib/meson.build

@@ -16,14 +16,21 @@ obelisk_lib_sources = files(
 )
 
 obelisk_lib_sources += obelisk_model_sources
-
-sqlite3 = dependency('sqlite3')
+obelisk_lib_sources += sqlite_sources
 
 incdirs = include_directories(['.', 'include'])
-lib = library('obelisk',
+
+lib = static_library('obelisk',
     obelisk_lib_sources,
+    c_args : sqlite_args,
+    include_directories: [incdirs, sqlite_include_directories],
+    install : true
+)
+
+shared_library('obelisk',
+    obelisk_lib_sources,
+    c_args : sqlite_args,
     include_directories: incdirs,
-    dependencies : [sqlite3],
     version : meson.project_version(),
     soversion : project_version_lib,
     install : true