Change symbols rappresentation

Mroik · May 9, 2024 · 51843b8 · 51843b8
1 parent d915f99
commit 51843b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/fitch.rs b/src/fitch.rs
@@ -16,9 +16,9 @@ impl Display for Proposition {
         match self {
             Self::Absurdum => write!(f, "⊥"),
             Self::Term(name) => write!(f, "{}", name),
-            Self::And(left, right) => write!(f, "({} ^ {})", left, right),
-            Self::Or(left, right) => write!(f, "({} v {})", left, right),
-            Self::Not(t) => write!(f, "(!{})", t),
+            Self::And(left, right) => write!(f, "({} & {})", left, right),
+            Self::Or(left, right) => write!(f, "({} | {})", left, right),
+            Self::Not(t) => write!(f, "(~{})", t),
             Self::Implies(left, right) => write!(f, "({} => {})", left, right),
             Self::Iff(left, right) => write!(f, "({} <=> {})", left, right),
         }

diff --git a/src/parser.rs b/src/parser.rs
@@ -51,7 +51,7 @@ fn parse_and(queue: &str) -> Result {
         Result::Failure => Result::Failure,
         Result::Success(left, rest) => {
             queue = rest.trim_start();
-            if queue.is_empty() || queue.chars().nth(0).unwrap() != '^' {
+            if queue.is_empty() || queue.chars().nth(0).unwrap() != '&' {
                 return Result::Failure;
             }
             queue = queue[1..].trim_start();
@@ -83,7 +83,7 @@ fn parse_or(queue: &str) -> Result {
         Result::Failure => Result::Failure,
         Result::Success(left, rest) => {
             queue = rest.trim_start();
-            if queue.is_empty() || queue.chars().nth(0).unwrap() != 'v' {
+            if queue.is_empty() || queue.chars().nth(0).unwrap() != '|' {
                 return Result::Failure;
             }
             queue = queue[1..].trim_start();