Support for keywords and classes

Author: x87

Cargo.lock

@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+sanny_builder_core = { git = "https://github.com/sannybuilder/core", branch = "master", package = "sanny_builder_core" }

Cargo.toml

@@ -1,18 +1,88 @@
+extern crate sanny_builder_core as sb;
+use sb::dictionary::dictionary_num_by_str::DictNumByStr;
+use sb::dictionary::ffi::*;
+use sb::namespaces::namespaces::Namespaces;
+use std::ffi::CString;
+
 fn main() {
     if let Some(input_file) = std::env::args().nth(1) {
         match std::fs::read(input_file) {
             Ok(buf) => {
                 let file_content = String::from_utf8_lossy(&buf);
                 let mut uniq_opcodes = vec![];
                 let mut output = vec![];
+                let mut keywords = DictNumByStr::new(
+                    Duplicates::Replace,
+                    CaseFormat::NoFormat,
+                    String::from(";"),
+                    String::from("=,"),
+                    true,
+                    true,
+                );
+                let mut classes = Namespaces::new();
+
+                // todo: read from command line
+                let has_keywords = keywords.load_file("keywords.txt").is_some();
+                let has_classes = classes.load_classes("classes.db").is_some();
 
                 for line in file_content.lines() {
                     let line = line.trim();
+
+                    // opcode
                     if let Some(':') = line.chars().nth(4) {
-                        let opcode = line.get(0..4).unwrap();
-                        if !uniq_opcodes.contains(&opcode) {
-                            uniq_opcodes.push(opcode);
-                            output.push(line);
+                        if let Some(opcode) = line.get(0..4) {
+                            if !uniq_opcodes.contains(&opcode) {
+                                uniq_opcodes.push(opcode);
+                                output.push(line);
+                                continue;
+                            }
+                        }
+                    }
+
+                    if !has_classes && !has_keywords {
+                        continue;
+                    }
+
+                    if let Some(first_word) = line
+                        .split(|c: char| {
+                            c.is_ascii_whitespace() || c == '(' || c == ')' || c == ','
+                        })
+                        .next()
+                    {
+                        // keyword
+                        if has_keywords {
+                            if let Some(key) = CString::new(first_word).ok() {
+                                if keywords.map.contains_key(&key) {
+                                    if !uniq_opcodes.contains(&first_word) {
+                                        uniq_opcodes.push(first_word);
+                                        output.push(line);
+                                        continue;
+                                    }
+                                }
+                            }
+                        }
+
+                        // classes
+                        if has_classes {
+                            if first_word.contains('.') {
+                                let mut class = first_word.split(|c| c == '.');
+
+                                if let Some(class_name) = class.next() {
+                                    if let Some(member_name) = class.next() {
+                                        // bug: see https://github.com/sannybuilder/dev/issues/92
+                                        if classes
+                                            .get_opcode_index_by_name(class_name, member_name)
+                                            .is_some()
+                                        {
+                                            if !uniq_opcodes.contains(&first_word) {
+                                                uniq_opcodes.push(first_word);
+                                                output.push(line);
+                                                continue;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }

src/main.rs

@@ -0,0 +1,8 @@
+0000: nop
+  0001: wait
+
+
+terminate_this_script
+
+player.money($player) += 1
+player.controllable(0)