Merge pull request #28 from tirix/sts-tc

Correct STS typecode for syntax definitions
tirix · Nov 12, 2023 · 79043c6 · 79043c6
2 parents fcd37d4 + bf8f09b
commit 79043c6
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/src/statement.rs b/src/statement.rs
@@ -118,7 +118,7 @@ impl ExpressionRenderer {
             let nset = database.name_result();
             let grammar = database.grammar_result();
             let mut tokens = sref.math_iter();
-            let _typecode = nset.get_atom(&tokens.next().unwrap());
+            let typecode = nset.get_atom(&tokens.next().unwrap());
             grammar
                 .parse_formula(
                     &mut tokens.map(|t| {
@@ -128,7 +128,7 @@ impl ExpressionRenderer {
                         })
                     }),
                     &grammar.typecodes(),
-                    true,
+                    typecode == grammar.provable_typecode(),
                     nset,
                 )
                 .map_err(|e| format!("Could not parse formula (GF): {}", e))
@@ -139,17 +139,10 @@ impl ExpressionRenderer {
         &self,
         formula: &Formula,
         database: &Database,
-        use_provables: bool,
+        #[allow(unused_variables)] use_provables: bool,
     ) -> Result<String, String> {
         match self {
-            ExpressionRenderer::Ascii => {
-                let s = format!("<pre>{}</pre>", formula.as_ref(database));
-                Ok(if use_provables {
-                    s.replace("wff ", " |- ")
-                } else {
-                    s
-                })
-            }
+            ExpressionRenderer::Ascii => Ok(format!("<pre>{}</pre>", formula.as_ref(database))),
             ExpressionRenderer::Unicode(uni) => uni.render_formula(formula),
             #[cfg(feature = "sts")]
             ExpressionRenderer::Sts(sts) => sts.render_formula(formula, use_provables),