filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parser improvements

Browse Source
This commit is contained in:
filipriec
2025-03-15 21:08:49 +01:00
parent d8a52b9d73
commit d0bc41978d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/steel/server/syntax_parser.rs
View File

@@ -3,7 +3,7 @@ use regex::Regex;
use std::collections::HashSet; use std::collections::HashSet;
pub struct SyntaxParser { pub struct SyntaxParser {
same_table_column_re: Regex, current_table_column_re: Regex,
different_table_column_re: Regex, different_table_column_re: Regex,
one_to_many_indexed_re: Regex, one_to_many_indexed_re: Regex,
sql_integration_re: Regex, sql_integration_re: Regex,
@@ -12,7 +12,7 @@ pub struct SyntaxParser {
impl SyntaxParser { impl SyntaxParser {
pub fn new() -> Self { pub fn new() -> Self {
SyntaxParser { SyntaxParser {
same_table_column_re: Regex::new(r"@(\w+)").unwrap(), current_table_column_re: Regex::new(r"@(\w+)").unwrap(),
different_table_column_re: Regex::new(r"@(\w+)\.(\w+)").unwrap(), different_table_column_re: Regex::new(r"@(\w+)\.(\w+)").unwrap(),
one_to_many_indexed_re: Regex::new(r"@(\w+)\[(\d+)\]\.(\w+)").unwrap(), one_to_many_indexed_re: Regex::new(r"@(\w+)\[(\d+)\]\.(\w+)").unwrap(),
sql_integration_re: Regex::new(r#"@sql\((['"])(.*?)['"]\)"#).unwrap(), sql_integration_re: Regex::new(r#"@sql\((['"])(.*?)['"]\)"#).unwrap(),
@@ -24,18 +24,18 @@ impl SyntaxParser {
// Process indexed access first to avoid overlap with relationship matches // Process indexed access first to avoid overlap with relationship matches
transformed = self.one_to_many_indexed_re.replace_all(&transformed, |caps: &regex::Captures| { transformed = self.one_to_many_indexed_re.replace_all(&transformed, |caps: &regex::Captures| {
format!("(get_related_index \"{}\" {} \"{}\")", format!("(steel_get_column_with_index \"{}\" {} \"{}\")",
&caps[1], &caps[2], &caps[3]) &caps[1], &caps[2], &caps[3])
}).to_string(); }).to_string();
// Process relationships // Process relationships
transformed = self.different_table_column_re.replace_all(&transformed, |caps: &regex::Captures| { transformed = self.different_table_column_re.replace_all(&transformed, |caps: &regex::Captures| {
format!("(get_related_value \"{}\" \"{}\")", &caps[1], &caps[2]) format!("(steel_get_column \"{}\" \"{}\")", &caps[1], &caps[2])
}).to_string(); }).to_string();
// Process basic column access // Process basic column access
transformed = self.same_table_column_re.replace_all(&transformed, |caps: &regex::Captures| { transformed = self.current_table_column_re.replace_all(&transformed, |caps: &regex::Captures| {
format!("(steel_get_column \"{}\")", &caps[1]) format!("(steel_get_column \"{}\" \"{}\")", current_table, &caps[1])
}).to_string(); }).to_string();
// Process SQL integration // Process SQL integration
@@ -46,14 +46,15 @@ impl SyntaxParser {
transformed transformed
} }
pub fn extract_current_table(&self, script: &str) -> (HashSet<String>, HashSet<String>) {
}
pub fn extract_dependencies(&self, script: &str) -> (HashSet<String>, HashSet<String>) { pub fn extract_dependencies(&self, script: &str) -> (HashSet<String>, HashSet<String>) {
let mut tables = HashSet::new(); let mut tables = HashSet::new();
let mut columns = HashSet::new(); let mut columns = HashSet::new();
for cap in self.current_table_column_re.captures_iter(script) {
tables.insert(current_table.to_string());
columns.insert(cap[1].to_string());
}
for cap in self.different_table_column_re.captures_iter(script) { for cap in self.different_table_column_re.captures_iter(script) {
tables.insert(cap[1].to_string()); tables.insert(cap[1].to_string());
columns.insert(cap[2].to_string()); columns.insert(cap[2].to_string());