Merge remote-tracking branch 'origin/main' into ql_gen

nickrolfe · nickrolfe · commit 59580d51bbcf · 2020-10-28T10:30:36.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+Cargo.lock   -diff -whitespace
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,8 +20,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: true
       - name: Build
         run: cargo build --verbose
       - name: Run tests
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "tree-sitter-ruby"]
-	path = tree-sitter-ruby
-	url = https://github.com/tree-sitter/tree-sitter-ruby.git
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/extractor/Cargo.toml b/extractor/Cargo.toml
@@ -9,9 +9,7 @@ edition = "2018"
 [dependencies]
 node-types = { path = "../node-types" }
 tree-sitter = "0.17.0"
+tree-sitter-ruby = "0.16"
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
-[build-dependencies]
-cc="*"
-
diff --git a/extractor/build.rs b/extractor/build.rs
diff --git a/extractor/src/main.rs b/extractor/src/main.rs
@@ -4,15 +4,8 @@ use clap;
 use std::fs;
 use std::io::BufRead;
 use std::path::{Path, PathBuf};
-use tree_sitter::Language;
-
-const NODE_TYPES: &'static str = include_str!("../../tree-sitter-ruby/src/node-types.json");
 
 fn main() -> std::io::Result<()> {
-    extern "C" {
-        fn tree_sitter_ruby() -> Language;
-    }
-
     tracing_subscriber::fmt()
         .with_target(false)
         .without_time()
@@ -43,8 +36,8 @@ fn main() -> std::io::Result<()> {
     let file_list = matches.value_of("file-list").expect("missing --file-list");
     let file_list = fs::File::open(file_list)?;
 
-    let language = unsafe { tree_sitter_ruby() };
-    let schema = node_types::read_node_types_str(NODE_TYPES)?;
+    let language = tree_sitter_ruby::language();
+    let schema = node_types::read_node_types_str(tree_sitter_ruby::NODE_TYPES)?;
     let mut extractor = extractor::create(language, schema);
     for line in std::io::BufReader::new(file_list).lines() {
         let path = PathBuf::from(line?);
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
@@ -10,3 +10,4 @@ edition = "2018"
 node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
+tree-sitter-ruby = "0.16"
diff --git a/generator/src/language.rs b/generator/src/language.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 pub struct Language {
     pub name: String,
-    pub node_types_path: PathBuf,
+    pub node_types: &'static str,
     pub dbscheme_path: PathBuf,
     pub ql_library_path: PathBuf,
 }
diff --git a/generator/src/main.rs b/generator/src/main.rs
@@ -288,13 +288,13 @@ fn main() {
     // command line.
     let ruby = Language {
         name: "Ruby".to_string(),
-        node_types_path: PathBuf::from("tree-sitter-ruby/src/node-types.json"),
+        node_types: tree_sitter_ruby::NODE_TYPES,
         dbscheme_path: PathBuf::from("ruby.dbscheme"),
         ql_library_path: PathBuf::from("ruby_ast.qll"),
     };
-    match node_types::read_node_types(&ruby.node_types_path) {
+    match node_types::read_node_types_str(&ruby.node_types) {
         Err(e) => {
-            error!("Failed to read '{}': {}", ruby.node_types_path.display(), e);
+            error!("Failed to read node-types JSON for {}: {}", ruby.name, e);
             std::process::exit(1);
         }
         Ok(nodes) => {
diff --git a/tree-sitter-ruby b/tree-sitter-ruby

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "tree-sitter-ruby"]`
`2`		`- path = tree-sitter-ruby`
`3`		`- url = https://github.com/tree-sitter/tree-sitter-ruby.git`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use std::path::PathBuf;`
`2`	`2`
`3`	`3`	`pub struct Language {`
`4`	`4`	`pub name: String,`
`5`		`- pub node_types_path: PathBuf,`
	`5`	`+ pub node_types: &'static str,`
`6`	`6`	`pub dbscheme_path: PathBuf,`
`7`	`7`	`pub ql_library_path: PathBuf,`
`8`	`8`	`}`