--- psiconv/trunk/lib/psiconv/parse_formula.c	2001/02/03 15:11:31	106
+++ psiconv/trunk/lib/psiconv/parse_formula.c	2001/02/08 20:03:49	107
@@ -48,11 +48,14 @@
     {psiconv_formula_op_pow,2,"^"},
     {psiconv_formula_op_pos,1,"+"},
     {psiconv_formula_op_neg,1,"-"},
+    {psiconv_formula_op_not,1,"NOT"},
+    {psiconv_formula_op_and,2,"AND"},
+    {psiconv_formula_op_or,2,"OR"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},   /* 10 */
     {psiconv_formula_op_con,2,"&"},
-    {psiconv_formula_op_bra,1,"{}"},
+    {psiconv_formula_op_bra,1,"()"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_mark_eof,0,"End of formula"},
@@ -278,9 +281,6 @@
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
-    {psiconv_formula_unknown,0,"*UNKNOWN*"},
-    {psiconv_formula_unknown,0,"*UNKNOWN*"},
-    {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},
     {psiconv_formula_unknown,0,"*UNKNOWN*"},