master > master: codego - generics

codego/aussagenlogik/formulae/formulae_construction.go

@@ -22,23 +22,25 @@ var Contradiction = Formula{
  * METHODS: Constructions
  * ---------------------------------------------------------------- */
 
-func Atom(expr string) Formula {
+func Atom(name string) Formula {
 	return Formula{
 		kind:        "atom",
-		expr:        expr,
+		name:        name,
+		expr:        name,
 		valence:     0,
 		subformulae: [](*Formula){},
 	}
 }
 
-func NegatedAtom(expr string) Formula {
-	return Negation(Atom(expr))
+func NegatedAtom(name string) Formula {
+	return Negation(Atom(name))
 }
 
-func Generic(expr string) Formula {
+func Generic(name string) Formula {
 	return Formula{
 		kind:        "generic",
-		expr:        expr,
+		name:        name,
+		expr:        "{" + name + "}",
 		valence:     0,
 		subformulae: [](*Formula){},
 	}