Fixing the n>1 bug by re-ordering atom and comparison within the fol …

…grammar
potassco · Nov 30, 2023 · e408732 · e408732
1 parent 2573625
commit e408732
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/parsing/fol/grammar.pest b/src/parsing/fol/grammar.pest
@@ -68,7 +68,7 @@ relation = { greater_equal | less_equal | greater | less | not_equal | equal }
 
 guard = { relation ~ general_term }
 
-atomic_formula = { truth | falsity | atom | comparison }
+atomic_formula = { truth | falsity | comparison | atom }
     truth      = { "#true" }
     falsity    = { "#false" }
     comparison = { general_term ~ guard+ }

diff --git a/src/parsing/fol/pest.rs b/src/parsing/fol/pest.rs
@@ -885,6 +885,18 @@ mod tests {
                         }],
                     }),
                 ),
+                (
+                    "n > 1",
+                    AtomicFormula::Comparison(Comparison {
+                        term: GeneralTerm::Symbol("n".to_string()),
+                        guards: vec![Guard {
+                            relation: Relation::Greater,
+                            term: GeneralTerm::IntegerTerm(IntegerTerm::BasicIntegerTerm(
+                                BasicIntegerTerm::Numeral(1),
+                            )),
+                        }],
+                    }),
+                ),
                 (
                     "1 <= N$g > 3 < X$i",
                     AtomicFormula::Comparison(Comparison {