From d5605e8ab7db0e3f9ec65b9410b8e6660e52608d Mon Sep 17 00:00:00 2001 From: Cookiebowser <lucas.doering@live.de> Date: Mon, 11 Jul 2022 11:34:58 +0200 Subject: [PATCH] added empty set_initialization to templates --- .../codegenerator/generators/SubstitutionGenerator.java | 7 ++----- .../resources/de/hhu/stups/codegenerator/CTemplate.stg | 2 ++ .../de/hhu/stups/codegenerator/ClojureTemplate.stg | 2 ++ .../resources/de/hhu/stups/codegenerator/CppTemplate.stg | 2 ++ .../resources/de/hhu/stups/codegenerator/JavaTemplate.stg | 2 ++ .../de/hhu/stups/codegenerator/PrologTemplate.stg | 4 +++- .../de/hhu/stups/codegenerator/PythonTemplate.stg | 2 ++ .../resources/de/hhu/stups/codegenerator/TsTemplate.stg | 2 ++ 8 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/hhu/stups/codegenerator/generators/SubstitutionGenerator.java b/src/main/java/de/hhu/stups/codegenerator/generators/SubstitutionGenerator.java index c53f4028f..227cfc5f7 100644 --- a/src/main/java/de/hhu/stups/codegenerator/generators/SubstitutionGenerator.java +++ b/src/main/java/de/hhu/stups/codegenerator/generators/SubstitutionGenerator.java @@ -129,11 +129,8 @@ public class SubstitutionGenerator { String body = ""; if (node.getInitialisation() != null) body = machineGenerator.visitSubstitutionNode(node.getInitialisation(), null); //TODO: add empty templates in other languages instead of checking for existence - if (currentGroup.getInstanceOf("set_initialization") != null) { - //Rust needs the Set declaration and initialization separat - List<String> setInitializations = declarationGenerator.generateSetDeclarations(node, "set_initialization"); - if (setInitializations.size() > 0) TemplateHandler.add(initialization, "set_initializations", String.join("\n", setInitializations)); - } + List<String> setInitializations = declarationGenerator.generateSetDeclarations(node, "set_initialization"); + if (setInitializations.size() > 0) TemplateHandler.add(initialization, "set_initializations", String.join("\n", setInitializations)); TemplateHandler.add(initialization, "stateCount", machineGenerator.getCurrentStateCount()); if (body.trim().length() > 0) TemplateHandler.add(initialization, "body", body); diff --git a/src/main/resources/de/hhu/stups/codegenerator/CTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/CTemplate.stg index f02162989..6014c9110 100644 --- a/src/main/resources/de/hhu/stups/codegenerator/CTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/CTemplate.stg @@ -313,3 +313,5 @@ include_initialization() ::= << transition_cache_declaration(type, identifier, operationHasParams) ::= << >> + +set_initialization(identifier, type, enums) ::= <<>> diff --git a/src/main/resources/de/hhu/stups/codegenerator/ClojureTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/ClojureTemplate.stg index 8ab3e55e8..5e84b42ad 100644 --- a/src/main/resources/de/hhu/stups/codegenerator/ClojureTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/ClojureTemplate.stg @@ -263,3 +263,5 @@ include_initialization() ::= << transition_cache_declaration(type, identifier, operationHasParams) ::= << >> + +set_initialization(identifier, type, enums) ::= <<>> diff --git a/src/main/resources/de/hhu/stups/codegenerator/CppTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/CppTemplate.stg index 43c824f2a..d4e9b6585 100644 --- a/src/main/resources/de/hhu/stups/codegenerator/CppTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/CppTemplate.stg @@ -1419,3 +1419,5 @@ include_initialization() ::= << transition_cache_declaration(type, identifier, operationHasParams) ::= << mutable boost::optional\<<if(operationHasParams)>BSet\<<type>\><else>bool<endif>\> _tr_cache_<identifier>; >> + +set_initialization(identifier, type, enums) ::= <<>> diff --git a/src/main/resources/de/hhu/stups/codegenerator/JavaTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/JavaTemplate.stg index 09301862f..66fcf78ed 100644 --- a/src/main/resources/de/hhu/stups/codegenerator/JavaTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/JavaTemplate.stg @@ -1613,3 +1613,5 @@ include_initialization() ::= << transition_cache_declaration(type, identifier, operationHasParams) ::= << >> + +set_initialization(identifier, type, enums) ::= <<>> diff --git a/src/main/resources/de/hhu/stups/codegenerator/PrologTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/PrologTemplate.stg index 522e40ac4..7536289b0 100644 --- a/src/main/resources/de/hhu/stups/codegenerator/PrologTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/PrologTemplate.stg @@ -528,4 +528,6 @@ while(iterationConstruct1, iterationConstruct2, predicate, then) ::= << % do <then> ->> \ No newline at end of file +>> + +set_initialization(identifier, type, enums) ::= <<>> diff --git a/src/main/resources/de/hhu/stups/codegenerator/PythonTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/PythonTemplate.stg index 0530498f1..7b8e443bd 100644 --- a/src/main/resources/de/hhu/stups/codegenerator/PythonTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/PythonTemplate.stg @@ -731,3 +731,5 @@ include_initialization() ::= << transition_cache_declaration(type, identifier, operationHasParams) ::= << >> + +set_initialization(identifier, type, enums) ::= <<>> diff --git a/src/main/resources/de/hhu/stups/codegenerator/TsTemplate.stg b/src/main/resources/de/hhu/stups/codegenerator/TsTemplate.stg index 1275142a4..c4fc08080 100755 --- a/src/main/resources/de/hhu/stups/codegenerator/TsTemplate.stg +++ b/src/main/resources/de/hhu/stups/codegenerator/TsTemplate.stg @@ -993,3 +993,5 @@ include_initialization() ::= << transition_cache_declaration(type, identifier, operationHasParams) ::= << >> + +set_initialization(identifier, type, enums) ::= <<>> -- GitLab