You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/06/01 12:43:21 UTC
[plc4x] branch develop updated: fix(plc4cs): fix arrays access
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 68a276ed6a fix(plc4cs): fix arrays access
68a276ed6a is described below
commit 68a276ed6a294da6d56a45c077e04ee87e7a1693
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Jun 1 14:43:15 2022 +0200
fix(plc4cs): fix arrays access
---
.../org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java b/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java
index aeec80d66b..77f5659d69 100644
--- a/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java
+++ b/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java
@@ -928,7 +928,7 @@ public class CsLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
sb.append(")");
if (variableLiteral.getIndex().isPresent()) {
// TODO: If this is a byte typed field, this needs to be an array accessor instead.
- sb.append(".get(").append(variableLiteral.getIndex()).append(")");
+ sb.append(".get(").append(variableLiteral.getIndex().orElseThrow()).append(")");
}
return tracer + sb.toString();
}
@@ -951,7 +951,7 @@ public class CsLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
}
if (variableLiteral.getIndex().isPresent()) {
// TODO: If this is a byte typed field, this needs to be an array accessor instead.
- sb.append(".get(").append(variableLiteral.getIndex()).append(")");
+ sb.append(".get(").append(variableLiteral.getIndex().orElseThrow()).append(")");
}
return tracer + sb.toString() + variableLiteral.getChild().map(child -> "." + toVariableExpressionRest(field, resultType, child)).orElse("");
}
@@ -1127,10 +1127,10 @@ public class CsLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
String variableLiteralName = variableLiteral.getName();
if (variableLiteralName.equals("length")) {
tracer = tracer.dive("length");
- return tracer + variableLiteralName + "()" + ((variableLiteral.getIndex().isPresent() ? ".get(" + variableLiteral.getIndex() + ")" : "") +
+ return tracer + variableLiteralName + "()" + ((variableLiteral.getIndex().isPresent() ? ".get(" + variableLiteral.getIndex().orElseThrow() + ")" : "") +
variableLiteral.getChild().map(child -> "." + toVariableExpressionRest(field, resultType, child)).orElse(""));
}
- return tracer + "get" + WordUtils.capitalize(variableLiteralName) + "()" + ((variableLiteral.getIndex().isPresent() ? ".get(" + variableLiteral.getIndex() + ")" : "") +
+ return tracer + "get" + WordUtils.capitalize(variableLiteralName) + "()" + ((variableLiteral.getIndex().isPresent() ? ".get(" + variableLiteral.getIndex().orElseThrow() + ")" : "") +
variableLiteral.getChild().map(child -> "." + toVariableExpressionRest(field, resultType, child)).orElse(""));
}