Merge pull request #1220 from AmpersandTarski/development

Release version 4.4.1

.github/workflows/build-push-to-docker-hub.yml

@@ -20,7 +20,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Build and push Docker images
-      uses: docker/build-push-action@v1
+      uses: docker/build-push-action@v2
       with:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_PASSWORD }}

AmpersandData/FormalAmpersand/Contexts.adl

@@ -1,6 +1,7 @@
 CONTEXT RAP IN ENGLISH
 INCLUDE "Rules.adl"
 INCLUDE "Relations.adl"
+INCLUDE "Patterns.adl"
 
 
 VIEW Signature: Signature( TXT "[" , src;name[Concept*ConceptName] , TXT "*" , tgt;name[Concept*ConceptName] , TXT "]" )
@@ -32,6 +33,8 @@ PATTERN Context
       MEANING "A ContextName without Context will be removed."
       VIOLATION ( TXT "{EX} DelAtom;ContextName;", SRC I )
 
+    IDENT Pattern: Pattern(name[Pattern*PatternName],context[Pattern*Context])
+
     RELATION name[Concept*ConceptName] [UNI,TOT] 
     MEANING "Every relation has a name by which it can be referenced within its Context(s)."
     REPRESENT ConceptName TYPE ALPHANUMERIC
@@ -145,45 +148,6 @@ PATTERN Validity
     VIOLATION (TXT "Rule ", SRC name, TXT " is not valid in context ", TGT I)
 ENDPATTERN
 
-PATTERN Patterns
-    CONCEPT Pattern "A pattern is a container for relation declarations and rule definitions"
-    VIEW Pattern: Pattern(name[Pattern*PatternName])
-    IDENT Pattern: Pattern(name[Pattern*PatternName],context[Pattern*Context])
-    REPRESENT PatternName TYPE ALPHANUMERIC
-    RELATION name[Pattern*PatternName] [UNI,TOT,SUR]
-    MEANING "The name of a pattern."
-      ROLE ExecEngine MAINTAINS "del unused PatternName"
-      RULE "del unused PatternName" : I[PatternName] |- name~;name
-      MEANING "A PatternName without Pattern will be removed."
-      VIOLATION ( TXT "{EX} DelAtom;PatternName;", SRC I )
-
-
-    RELATION allRules[Rule*Context] []          -- ^ all rules in the context, i.e. all user defined rules, property rules, and identity rules.
-    RELATION udefrules[Rule*Pattern] []         -- ^ all rules the user has declared within this pattern including the patterns it contains,
-                                                --   which are not property- and not identity rules. See ViewPoint.hs
-    RELATION proprules[Rule*Pattern] []         -- ^ all property rules the user has declared within a pattern.
-    RELATION identityRules[Rule*Pattern] []     -- ^ all identity rules the user has declared within this pattern. This contains all rules declared inside a pattern including the patterns it contains.
-    RELATION patRules[Pattern*Rule]        -- This contains all rules declared inside a pattern. This contains all rules declared inside a pattern including the patterns it contains.
-    MEANING "The user-defined rules in a pattern."
-    RELATION declaredIn[Relation*Pattern]  -- comes from class Language. This contains all relations declared inside a pattern.
-    MEANING "The relations that are declared in a pattern."
-
-    ROLE ExecEngine MAINTAINS "Remove rule atom"
-    RULE "Remove rule atom" : I[Rule] - allRules;I[Context];allRules~ |- -V
-    MEANING "A rule without declaration will be removed."
-    VIOLATION ( TXT "{EX} DelAtom;Rule;", SRC I )
-
-    ROLE ExecEngine MAINTAINS "Remove relation atom"
-    RULE "Remove relation atom" : I[Relation] - relsDefdIn;I[Context];relsDefdIn~ |- -V
-    MEANING "A relation without declaration will be removed."
-    VIOLATION ( TXT "{EX} DelAtom;Relation;", SRC I )
-
-    ROLE User MAINTAINS "self-sustained rules"
-    RULE "self-sustained rules" : usedIn;formalTerm~;patRules~ |- declaredIn
-    MEANING "A relation that is used in a rule, which is declared in a pattern, must be declared in that same pattern."
-
-ENDPATTERN
-
 ENDCONTEXT
 
 

AmpersandData/FormalAmpersand/Contexts.docadl

@@ -1,4 +1,4 @@
-CONTEXT RAP IN ENGLISH
+CONTEXT FormalAmpersand IN ENGLISH
     PURPOSE RULE "validity of concepts in a context"
     {+The relation `context[Concept*Context]` represents all concepts that are valid within a context.
     Valid concepts can be used in the natural language and the formal language, which makes it relevant to register which concepts are valid within a context.

AmpersandData/FormalAmpersand/Documentation.adl

@@ -1,4 +1,4 @@
-CONTEXT RAP IN ENGLISH
+CONTEXT FormalAmpersand IN ENGLISH
 PURPOSE PATTERN Documentation
 {+
 +}

AmpersandData/FormalAmpersand/Generics.adl

@@ -1,4 +1,4 @@
-CONTEXT Generics IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 PURPOSE CONTEXT Generics
 {+This context specifies the administration that currently is, and in future will have been, the contents of GENERICS.PHP+}
 

AmpersandData/FormalAmpersand/Interfaces.adl

@@ -25,8 +25,6 @@ PATTERN "Static Interface Structure"
     RELATION context[Interface*Context][UNI]
     CONCEPT Interface "An interface is a mechanism that communicates data between different (two) contexts."
 
-    IDENT Interface: Interface(name,context[Interface*Context])
-
     REPRESENT Origin TYPE ALPHANUMERIC
     RELATION ifcPos[Interface*Origin] [UNI]
     MEANING "The position in the file (filename, line- and column number)."

AmpersandData/FormalAmpersand/Interfaces.docadl

@@ -1,4 +1,4 @@
-CONTEXT RAP IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 INCLUDE "Interfaces.adl"
 --! It is allowed to change texts and/or the order of texts IF AND ONLY IF this is also done in the corresponding Haskell files !--