Remove local souffle (#31)

* Use the external souffle.ts library
* Rip out the old souffle boilerplate code
* Fix tests that are failing due to non-determinism in call tree rules (paths are non-deterministic)
* Fix tests failing due to different ast node ids

Author: cd1m0

package-lock.json

@@ -16,11 +16,8 @@
         "gen-translation-modules": "node scripts/gen_translation_modules.js && eslint --fix src/gen/translate.ts src/gen/declarations.ts",
         "copy-dl": "cp -r src/lib/analyses dist/lib && cp -r src/lib/detectors dist/lib",
         "copy-functors": "cp -r functors dist/",
-        "build-parser": "jison src/lib/souffle/parser/souffle.jison -o src/lib/souffle/parser/souffle_parser_gen.js -m commonjs && cp src/lib/souffle/parser/souffle_parser_gen.js dist/lib/souffle/parser/souffle_parser_gen.js",
-        "build-expr-parser": "jison src/lib/souffle/parser/souffle_value.jison -o src/lib/souffle/parser/souffle_value_parser_gen.js -m commonjs && cp src/lib/souffle/parser/souffle_value_parser_gen.js dist/lib/souffle/parser/souffle_value_parser_gen.js",
-        "build-parsers": "npm run build-parser && npm run build-expr-parser",
         "build-functors": "./scripts/build_functors.sh",
-        "build": "npm run clean && npm run gen-translation-modules && npm run transpile && npm run build-parsers && chmod a+x dist/bin/cli.js && npm run copy-dl && npm run build-functors && npm run copy-functors",
+        "build": "npm run clean && npm run gen-translation-modules && npm run transpile && chmod a+x dist/bin/cli.js && npm run copy-dl && npm run build-functors && npm run copy-functors",
         "test": "c8 mocha",
         "lint": "eslint src/ test/ --ext=ts",
         "lint:fix": "eslint src/ test/ --ext=ts --fix",
@@ -34,7 +31,8 @@
         "fs-extra": "^11.2.0",
         "solc-typed-ast": "^18.1.2",
         "sqlite": "^5.1.1",
-        "sqlite3": "^5.1.7"
+        "sqlite3": "^5.1.7",
+        "souffle.ts": "^0.1.5"
     },
     "devDependencies": {
         "@ts-ast-parser/core": "^0.7.0",

package.json

@@ -4,5 +4,5 @@ MY_DIR=$(cd $(dirname $0) && pwd)
 FUNCTOR_DIR=$MY_DIR/../functors/
 
 echo "Building functors..."
-g++ $FUNCTOR_DIR/functors.cpp -c -fPIC -o $FUNCTOR_DIR/functors.o 
+g++ $FUNCTOR_DIR/functors.cpp -c -fPIC -o $FUNCTOR_DIR/functors.o -I/home/dimo/.local/include
 g++ -shared -o $FUNCTOR_DIR/libfunctors.so $FUNCTOR_DIR/functors.o

scripts/build_functors.sh

@@ -21,7 +21,7 @@ import {
     isExact
 } from "solc-typed-ast";
 import { analyze, buildDatalog, detect } from "../lib";
-import { SouffleCSVInstance } from "../lib/souffle/instance";
+import * as dl from "souffle.ts";
 
 const pkg = require("../../package.json");
 
@@ -306,8 +306,8 @@ async function main() {
             infer,
             "csv",
             options.dumpAnalyses
-        )) as SouffleCSVInstance;
-        const output = instance.results();
+        )) as dl.SouffleCSVInstance;
+        const output = await instance.allFacts();
         instance.release();
 
         for (const analysis of options.dumpAnalyses) {

src/bin/cli.ts

@@ -3,11 +3,11 @@ import * as sol from "solc-typed-ast";
 import { searchRecursive } from "./utils";
 import { OutputRelations } from "./souffle";
 import { DETECTORS_DIR } from "./detectors";
-import { Fact, FieldVal } from "./souffle/fact";
+import * as dl from "souffle.ts";
 
 type SignatureArgs = Array<[string, string]>;
 type ParsedSignature = [string, SignatureArgs];
-type SubstMap = Map<string, FieldVal>;
+type SubstMap = Map<string, dl.FieldVal>;
 
 interface DetectorTemplate {
     fileName: string;
@@ -54,7 +54,7 @@ export function parseTemplateSignature(sig: string): ParsedSignature {
     return [name, args];
 }
 
-function makeSubst(formals: SignatureArgs, fact: Fact): SubstMap {
+function makeSubst(formals: SignatureArgs, fact: dl.Fact): SubstMap {
     const res = new Map();
 
     sol.assert(