From d3e0572946f8bead8e188a637125cbd0bf7772b8 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Fri, 12 Aug 2016 15:24:47 +0000
Subject: [PATCH] corrected issue with C code generation
---
bin/config.xml | 2 +-
.../ctranslator/TMLCCodeGeneration.java | 2 +-
.../ctranslator/TMLCCodeGenerationError.java | 30 ++++++++++++++++---
src/ui/GTURTLEModeling.java | 1 +
4 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/bin/config.xml b/bin/config.xml
index bd18ddb886..c008bf1a9b 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -37,7 +37,7 @@
<SystemCCodeExecuteCommand data="/home/andream/TURTLE/simulators/c++2/run.x -ovcd /home/andream/TURTLE/simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="/home/andream/TURTLE/simulators/c++2/run.x -server" />
<TMLCodeDirectory data="/home/andream/TURTLE/tmlcode" />
-<CCodeDirectory data="/home/andream/TURTLE/Ccode" />
+<CcodeDirectory data="/home/andream/TURTLE/Ccode" />
<GTKWavePath data="/opt/local/bin/gtkwave" />
<VCDPath data="/home/andream/TURTLE/vcd/" />
<UPPAALCodeDirectory data="/home/andream/TURTLE/uppaal/" />
diff --git a/src/tmltranslator/ctranslator/TMLCCodeGeneration.java b/src/tmltranslator/ctranslator/TMLCCodeGeneration.java
index 68cd30d21e..976dfbd363 100755
--- a/src/tmltranslator/ctranslator/TMLCCodeGeneration.java
+++ b/src/tmltranslator/ctranslator/TMLCCodeGeneration.java
@@ -133,7 +133,7 @@ public class TMLCCodeGeneration {
prexList = new ArrayList<TMLPort>();
buffersList = new ArrayList<Buffer>();
dataTransfersList = new ArrayList<DataTransfer>();
- debugFileName = ConfigurationTTool.CcodeDirectory + "/debugFile.txt";
+ debugFileName = ConfigurationTTool.CcodeDirectory + "debugFile.txt";
tmlcpsList = new ArrayList<TMLCP>();
}
diff --git a/src/tmltranslator/ctranslator/TMLCCodeGenerationError.java b/src/tmltranslator/ctranslator/TMLCCodeGenerationError.java
index 9e0b4e33f9..dd86532df9 100755
--- a/src/tmltranslator/ctranslator/TMLCCodeGenerationError.java
+++ b/src/tmltranslator/ctranslator/TMLCCodeGenerationError.java
@@ -53,16 +53,38 @@ public class TMLCCodeGenerationError {
// type
public final static int ERROR_STRUCTURE = 0;
- public final static int WARNING_STRUCTURE = 1;
- public final static int ERROR_BEHAVIOR = 2;
+ public final static int WARNING_STRUCTURE = 1;
+ public final static int ERROR_BEHAVIOR = 2;
public final static int WARNING_BEHAVIOR = 3;
public int type; // ERROR, WARNING
public String message;
- public TMLTask task;
- public TMLActivityElement element;
+ public TMLTask task;
+ public TMLActivityElement element;
public TMLCCodeGenerationError( int _type ) {
type = _type;
}
+
+ @Override public String toString() {
+ String error_type = "";
+ switch( type ) {
+ case 0:
+ error_type = "ERROR_STRUCTURE";
+ break;
+ case 1:
+ error_type = "WARNING_STRUCTURE";
+ break;
+ case 2:
+ error_type = "ERROR_BEHAVIOR";
+ break;
+ case 3:
+ error_type = "WARNING_BEHAVIOR";
+ break;
+ default:
+ error_type = "NO RECOGNIZED ERROR TYPE";
+ break;
+ }
+ return "TMLCCodeGenerationError of type: " + error_type;
+ }
}
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 94f3eeee08..508d413ab3 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -433,6 +433,7 @@ public class GTURTLEModeling {
syntax.check();
if( syntax.hasErrors() ) {
for( TMLCCodeGenerationError error: syntax.getErrors() ) {
+ TraceManager.addDev( "ERROR: " + error.toString() );
if( error.type == TMLCCodeGenerationError.ERROR_STRUCTURE ) {
type = CheckingError.STRUCTURE_ERROR;
}
--
GitLab