From 0856bfc0b0c6116bd683a4ecfcdc42a044f87190 Mon Sep 17 00:00:00 2001
From: raj_mathe <raj.dahya@math.uni-leipzig.de>
Date: Sat, 15 May 2021 10:58:17 +0200
Subject: [PATCH] master > master: codego - generics

---
 .../aussagenlogik/formulae/formulae_basic.go  |  3 +++
 .../formulae/formulae_construction.go         | 14 ++++++-----
 codego/aussagenlogik/schema/schema.go         | 25 ++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/codego/aussagenlogik/formulae/formulae_basic.go b/codego/aussagenlogik/formulae/formulae_basic.go
index c85249b..d01f644 100644
--- a/codego/aussagenlogik/formulae/formulae_basic.go
+++ b/codego/aussagenlogik/formulae/formulae_basic.go
@@ -11,6 +11,7 @@ import (
 
 type Formula struct {
 	kind        string
+	name        string
 	expr        string
 	valence     int
 	subformulae [](*Formula)
@@ -28,6 +29,8 @@ func (fml *Formula) SetExpr(expr string) { fml.expr = expr }
 
 func (fml Formula) GetExpr() string { return fml.expr }
 
+func (fml Formula) GetName() string { return fml.name }
+
 func (fml *Formula) SetSubformulae(subfmls [](*Formula)) {
 	fml.subformulae = subfmls
 	fml.valence = len(subfmls)
diff --git a/codego/aussagenlogik/formulae/formulae_construction.go b/codego/aussagenlogik/formulae/formulae_construction.go
index bf4e817..c81d50a 100644
--- a/codego/aussagenlogik/formulae/formulae_construction.go
+++ b/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){},
 	}
diff --git a/codego/aussagenlogik/schema/schema.go b/codego/aussagenlogik/schema/schema.go
index 78de0d3..f02331d 100644
--- a/codego/aussagenlogik/schema/schema.go
+++ b/codego/aussagenlogik/schema/schema.go
@@ -3,6 +3,7 @@ package schema
 import (
 	"logik/aussagenlogik/formulae"
 	parser "logik/grammars/aussagenlogik"
+	"regexp"
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 )
@@ -65,22 +66,13 @@ func (ant antlrTree) getLabel() string {
 }
 
 func (ant antlrTree) getTextContent() string {
-	var expr string = ant.getLabel()
-	for _, subant := range ant.getChildren() {
-		expr += subant.getTextContent()
-	}
-	return expr
-}
-
-func (ant antlrTree) getTextContentLeaves() string {
 	var expr string = ""
 	var subants = ant.getChildren()
 	if len(subants) == 0 {
-		expr = ant.getLabel()
-	} else {
-		for _, subant := range subants {
-			expr += subant.getTextContent()
-		}
+		return ant.getLabel()
+	}
+	for _, subant := range subants {
+		expr += subant.getTextContent()
 	}
 	return expr
 }
@@ -116,9 +108,12 @@ func (ant antlrTree) toFormula() formulae.Formula {
 	case "contradiction":
 		return formulae.Contradiction
 	case "atom":
-		return formulae.Atom(ant.getTextContentLeaves())
+		name := ant.getTextContent()
+		return formulae.Atom(name)
 	case "generic":
-		return formulae.Generic(ant.getTextContentLeaves())
+		re := regexp.MustCompile(`^{|}$`)
+		name := string(re.ReplaceAll([]byte(ant.getTextContent()), []byte("")))
+		return formulae.Generic(name)
 	case "not":
 		// NOTE: expr = ! expr
 		if nChildren == 2 {