Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-10-02 19:33:00 +0000
committertjung2012-10-02 19:33:00 +0000
commit353984bdf92ba0b398a56ae24ac0d031940cf3a0 (patch)
treee85e76030f5a37c07cb17185aab331db284051ed /examples
parentd3e33a45e3639efd6d60353b1398ccd53775d3b9 (diff)
downloadorg.eclipse.etrice-353984bdf92ba0b398a56ae24ac0d031940cf3a0.tar.gz
org.eclipse.etrice-353984bdf92ba0b398a56ae24ac0d031940cf3a0.tar.xz
org.eclipse.etrice-353984bdf92ba0b398a56ae24ac0d031940cf3a0.zip
[tutorials.c] Types.room removed from Tutorials.
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exebin250505 -> 250505 bytes
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room5
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room22
3 files changed, 4 insertions, 23 deletions
diff --git a/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe b/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe
index 3f7b4392e..97cfc0d78 100644
--- a/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe
+++ b/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe
Binary files differ
diff --git a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room b/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room
index 6b360941b..f9e6b4552 100644
--- a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room
+++ b/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room
@@ -1,5 +1,8 @@
RoomModel RemoveComment {
- import room.basic.types.* from "Types.room"
+ import room.basic.types.* from "../../../org.eclipse.etrice.modellib.c/model/Types.room"
+
+ PrimitiveType file:ptInteger -> FILE default "0"
+
SubSystemClass RemoveCommentSubSys {
ActorRef Topref:ATop
}
diff --git a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room b/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room
deleted file mode 100644
index a9ccbf347..000000000
--- a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room
+++ /dev/null
@@ -1,22 +0,0 @@
-RoomModel room.basic.types {
-
- PrimitiveType boolean: ptBoolean -> boolean default "FALSE"
- PrimitiveType char: ptCharacter -> char default "0"
- PrimitiveType int8: ptInteger -> int8 default "0"
- PrimitiveType int16: ptInteger -> int16 default "0"
- PrimitiveType int32: ptInteger -> int32 default "0"
- PrimitiveType int64: ptInteger -> int64 default "0"
-
- PrimitiveType uint8: ptInteger -> uint8 default "0"
- PrimitiveType uint16: ptInteger -> uint16 default "0"
- PrimitiveType uint32: ptInteger -> uint32 default "0"
- PrimitiveType uint64: ptInteger -> uint64 default "0"
-
- PrimitiveType float32:ptReal -> float32 default "0"
- PrimitiveType float64:ptReal -> float64 default "0"
-
- // TODO: define strings for C
- PrimitiveType charPtr:ptCharacter -> charPtr default "0"
- PrimitiveType string:ptCharacter -> charPtr default "0"
- PrimitiveType file:ptInteger -> FILE default "0"
-} \ No newline at end of file

Back to the top