[WIP] Improved codegen (#34)

Cargo.toml

@@ -11,19 +11,23 @@ keywords = ["cli", "parser", "langdev", "language"]
 categories = ["command-line-utilities", "compilers", "text-editors"]
 license-file = "LICENSE.md"
 include = ["src/**/*", "LICENSE.md"]
+build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.44"
 combine = "4.6.1"
 termion = "1.5.6"
 unic-ucd-category = "0.9.0"
+swipl = "0.3.5"
 
 [dependencies.async-std]
 version = "1.10.0"
 features = ["unstable", "attributes"]
 
+[build-dependencies]
+swipl-info = "0.3.1"
+
 [features]
 
 [profile.release]

build.rs

@@ -0,0 +1,23 @@
+use std::env;
+use std::path::Path;
+use std::process::Command;
+
+use swipl_info::get_swipl_info;
+
+fn main() {
+  println!("cargo:rerun-if-changed=build.rs");
+  println!("cargo:rerun-if-changed=mlatu.pl");
+  println!("cargo:rustc-link-arg=-Wl,-rpath,{}", get_swipl_info().lib_dir);
+
+  let out_dir = env::var_os("OUT_DIR").unwrap();
+  let dest_path = Path::new(&out_dir).join("mlatu.pl.save");
+  Command::new("swipl").arg("-o")
+                       .arg(dest_path)
+                       .arg("--goal=true")
+                       .arg("-c")
+                       .arg("mlatu.pl")
+                       .spawn()
+                       .expect("spawn")
+                       .wait()
+                       .expect("wait");
+}

mlatu.pl

@@ -0,0 +1,37 @@
+:- module(mlatu, [rewrite/2, user_equiv/2]).
+:- dynamic([user_equiv/2], [multifile, discontiguous]).
+
+equiv(Xs, Other) :-
+    user_equiv(Xs, Other) ;
+    builtin_equiv(Xs, Other).
+
+builtin_equiv(['d',X|Xs], Other) :-
+    equiv([X,X|Xs], Other).
+
+builtin_equiv(['r',_|Xs], Other) :-
+    equiv(Xs, Other).
+
+builtin_equiv(['u',Quote|Xs], Other) :-
+    append(Quote, Xs, NewXs),
+    equiv(NewXs, Other).
+
+builtin_equiv(['q',X|Xs], Other) :-
+    equiv([[X]|Xs], Other).
+
+builtin_equiv(['c',Quote1,Quote2|Xs], Other) :-
+    append(Quote1, Quote2, NewQuote),
+    equiv([NewQuote|Xs], Other).
+
+builtin_equiv(['s',A,B|Xs], Other) :-
+    equiv([B,A|Xs],Other).
+
+builtin_equiv([], []).
+builtin_equiv([X|Xs], Other) :-
+    equiv(Xs, New),
+    (Xs \= New ->
+        equiv([X|New], Other) ;
+        Other = [X|Xs]).
+
+rewrite(List, Other) :-
+    equiv(List, Other),
+    List \= Other.

prelude.mlt

@@ -1,2 +1,12 @@
-q = ( ) const;
-swap = q dip;
+concat = c;
+unquote = u;
+quote = q;
+swap = s;
+remove = r;
+dup = d;
+
+prepend = swap quote swap concat;
+p = prepend;
+
+unquote-before = swap quote cat unquote;
+uqb = unquote-before;

src/lib.rs

@@ -25,13 +25,10 @@
 
 mod ast;
 // mod editor;
-mod execute;
-mod gen;
 mod parser;
+pub mod prolog;
 // mod terminal;
 
 pub use ast::{pretty_rule, Rule, Term};
 // pub use editor::Editor;
-pub use execute::execute;
-pub use gen::generate;
 pub use parser::{parse_rule, parse_rules, parse_term, parse_terms};

src/main.rs

@@ -1,22 +1,96 @@
 use async_std::fs::OpenOptions;
+use async_std::io;
+use async_std::io::prelude::*;
 use async_std::path::PathBuf;
-use async_std::prelude::*;
-use mlatu::parse_rules;
+use mlatu::{parse_rules, parse_terms, prolog};
+use prolog::util::AssertLocation;
+use prolog::{codegen, ContextExt};
 
+// TODO: actual CLI, better REPL (w/ rustyline)
+// TODO: Bring back structural editing
+// BUG: Ctrl-C forwards to SWIPl
 #[async_std::main]
 async fn main() -> std::io::Result<()> {
-  // let path = if let Some(filename) = std::env::args().nth(2) {
-  //   PathBuf::from(filename)
-  // } else {
-  //   PathBuf::from("./prelude.mlt")
-  // };
-  // let mut file =
-  // OpenOptions::new().read(true).write(true).create(true).open(path).await?;
-  // let mut s = String::new();
-  // let _ = file.read_to_string(&mut s).await?;
-  // match parse_rules(&s) {
-  //   | Ok(rules) => Editor::new(file, rules).unwrap().run().await,
-  //   | Err(error) => eprintln!("{}", error),
-  // }
-  Ok(())
+  let engine = mlatu::prolog::init_engine();
+  let ctx:prolog::Context<'_, _> = engine.activate().into();
+
+  let path = if let Some(filename) = std::env::args().nth(2) {
+    PathBuf::from(filename)
+  } else {
+    PathBuf::from("./prelude.mlt")
+  };
+  let mut file = OpenOptions::new().read(true).write(true).create(true).open(path).await?;
+  let mut s = String::new();
+  let _ = file.read_to_string(&mut s).await?;
+  let rules = match parse_rules(&s) {
+    | Ok(rules) => rules,
+    | Err(error) => {
+      eprintln!("{}", error);
+      return Ok(())
+    },
+  };
+
+  let module = prolog::Module::new("mlatu");
+
+  let clauses = match codegen::generate(&ctx, &rules) {
+    | Ok(clauses) => clauses,
+    | Err(error) => {
+      eprintln!("Error while compiling rules: {}", error);
+      return Ok(())
+    },
+  };
+
+  if let Err(error) =
+    clauses.into_iter()
+           .try_for_each(|clause| ctx.assert(&clause.clause, Some(&module), AssertLocation::Last))
+  {
+    eprintln!("Error while compiling rules: {}", error);
+    return Ok(())
+  };
+
+  let stdin = io::stdin();
+  let mut stdout = io::stdout();
+
+  loop {
+    let mut contents = String::new();
+    print!(">>> ");
+    stdout.flush().await?;
+    stdin.read_line(&mut contents).await?;
+
+    if contents.trim() == "exit" || contents.trim() == "quit" || contents.is_empty() {
+      println!("Goodbye!");
+      break Ok(())
+    }
+
+    let terms = match parse_terms(&contents) {
+      | Ok(terms) => terms,
+      | Err(error) => {
+        eprintln!("{}", error);
+        continue
+      },
+    };
+
+    let (list, other) = match codegen::generate_query(&ctx, &terms) {
+      | Ok(q) => q,
+      | Err(error) => {
+        eprintln!("Error while compiling query: {}", error);
+        continue
+      },
+    };
+
+    if let Err(error) = ctx.call_once(prolog::pred!(mlatu: rewrite / 2), [&list, &other]) {
+      eprintln!("Error while executing query: {}", error);
+      continue
+    }
+    // TODO: proper printing
+    let canon = match ctx.canonical(&other) {
+      | Some(s) => s,
+      | None => {
+        eprintln!("Could not format output");
+        continue
+      },
+    };
+
+    println!("==> {}", canon);
+  }
 }

src/prolog.rs

@@ -0,0 +1,22 @@
+pub use swipl::fli;
+pub use swipl::prelude::*;
+
+pub mod codegen;
+pub mod util;
+pub use util::ContextExt;
+
+static SAVED_STATE:&[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/mlatu.pl.save"));
+
+#[must_use]
+pub fn init_engine() -> Engine {
+  let bytes = SAVED_STATE.as_ptr();
+  // SAFETY: This is called *before* `PL_initialise` (called when creating an
+  // engine). This data is also valid and the length is correct, as we take the
+  // pointer and length from a known valid slice.
+  let len = u64::try_from(SAVED_STATE.len()).expect("length");
+  unsafe {
+    fli::PL_set_resource_db_mem(bytes, len);
+  }
+
+  Engine::new()
+}