diff options
| author | Henrik Rentz-Reichert | 2012-02-02 10:09:22 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-02-02 10:09:22 +0000 |
| commit | 0de5eb081f268c234947d86994102fa3a8ce864a (patch) | |
| tree | 58bbb67c81c4d2d1c41909d92e6d1fc820f187a3 /plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room | |
| parent | b55690aca6ad5d17e699e809af481d1ffd04191e (diff) | |
| parent | cfe46b9799947e484ed42a2eefded0db55d43904 (diff) | |
| download | org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.gz org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.xz org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.zip | |
Merge remote branch 'refs/remotes/origin/master'
Conflicts:
plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/extensions/RoomExtensions.java
Diffstat (limited to 'plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room')
| -rw-r--r-- | plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room b/plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room index 6f8be178c..a8d3cc8ea 100644 --- a/plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room +++ b/plugins/org.eclipse.etrice.doc/model/040-DataClassNotation.room @@ -1,39 +1,39 @@ -RoomModel DataClassNotation { - - DataClass DataClass1 { - Attribute attribute1: int32 // attribute of PrimitveType - Attribute attribute2: float32 // attribute of another PrimitveType - - // no arguments, no return value - Operation operation1(): void { - "UserCodeLine1" - } - - // argument of PrimitiveType, no return value - Operation operation2(Param1: int32): void { - "UserCodeLine1" - } - - // argument of PrimitiveType, return value of of PrimitiveType - Operation operation3(Param1: int32): float64 { - "UserCodeLine1" - } - } - - DataClass DataClass2 { - Attribute attribute1: int32 // attribute of PrimitveType - Attribute attribute2: DataClass1 // attribute of DataClass - - // arguments and return value by value - Operation operation2(Param1: int32, Param2: DataClass1): DataClass1 { - "UserCodeLine1" - } - - // arguments and return value by reference, except for PrimitiveTypes - Operation operation1(Param1: int32, Param2: DataClass1 ref): DataClass1 ref { - "UserCodeLine1" - } - } - - +RoomModel DataClassNotation {
+
+ DataClass DataClass1 {
+ Attribute attribute1: int32 // attribute of PrimitveType
+ Attribute attribute2: float32 // attribute of another PrimitveType
+
+ // no arguments, no return value
+ Operation operation1(): void {
+ "UserCodeLine1"
+ }
+
+ // argument of PrimitiveType, no return value
+ Operation operation2(Param1: int32): void {
+ "UserCodeLine1"
+ }
+
+ // argument of PrimitiveType, return value of of PrimitiveType
+ Operation operation3(Param1: int32): float64 {
+ "UserCodeLine1"
+ }
+ }
+
+ DataClass DataClass2 {
+ Attribute attribute1: int32 // attribute of PrimitveType
+ Attribute attribute2: DataClass1 // attribute of DataClass
+
+ // arguments and return value by value
+ Operation operation2(Param1: int32, Param2: DataClass1): DataClass1 {
+ "UserCodeLine1"
+ }
+
+ // arguments and return value by reference, except for PrimitiveTypes
+ Operation operation1(Param1: int32, Param2: DataClass1 ref): DataClass1 ref {
+ "UserCodeLine1"
+ }
+ }
+
+
}
\ No newline at end of file |