Skip to content

Commit 9351968

Browse files
author
x02lucpo
committed
merged HEAD with 1723 from branches/x02lucpo. Fixed comments on flat modelica and loadFile + loadFileInteractive
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@1725 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 0f226d9 commit 9351968

File tree

13 files changed

+432
-364
lines changed

13 files changed

+432
-364
lines changed

‎modeq/builtin.rml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ val unit = SCode.COMPONENT("unit",true,false,false,
171171
SCode.PARAM,
172172
Absyn.BIDIR),
173173
Absyn.IDENT("StringType"),
174-
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE)
174+
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE,NONE)
175175

176176
val quantity = SCode.COMPONENT("quantity",true,false,false,
177177
SCode.ATTR([],
@@ -180,7 +180,7 @@ val quantity = SCode.COMPONENT("quantity",true,false,false,
180180
SCode.PARAM,
181181
Absyn.BIDIR),
182182
Absyn.IDENT("StringType"),
183-
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE)
183+
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE,NONE)
184184

185185
val display_unit = SCode.COMPONENT("displayUnit",true,false,false,
186186
SCode.ATTR([],
@@ -189,7 +189,7 @@ val display_unit = SCode.COMPONENT("displayUnit",true,false,false,
189189
SCode.PARAM,
190190
Absyn.BIDIR),
191191
Absyn.IDENT("StringType"),
192-
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE)
192+
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE,NONE)
193193

194194
val min = SCode.COMPONENT("min",true,false,false,
195195
SCode.ATTR([],
@@ -198,7 +198,7 @@ val min = SCode.COMPONENT("min",true,false,false,
198198
SCode.PARAM,
199199
Absyn.BIDIR),
200200
Absyn.IDENT("RealType"),
201-
SCode.MOD(false,[],SOME(Absyn.REAL(-1e99))),NONE)
201+
SCode.MOD(false,[],SOME(Absyn.REAL(-1e99))),NONE,NONE)
202202

203203
val max = SCode.COMPONENT("max",true,false,false,
204204
SCode.ATTR([],
@@ -207,7 +207,7 @@ val max = SCode.COMPONENT("max",true,false,false,
207207
SCode.PARAM,
208208
Absyn.BIDIR),
209209
Absyn.IDENT("RealType"),
210-
SCode.MOD(false,[],SOME(Absyn.REAL(1e99))),NONE)
210+
SCode.MOD(false,[],SOME(Absyn.REAL(1e99))),NONE,NONE)
211211

212212
val real_start = SCode.COMPONENT("start",true,false,false,
213213
SCode.ATTR([],
@@ -216,7 +216,7 @@ val real_start = SCode.COMPONENT("start",true,false,false,
216216
SCode.PARAM,
217217
Absyn.BIDIR),
218218
Absyn.IDENT("RealType"),
219-
SCode.MOD(false,[],SOME(Absyn.REAL(0.0))),NONE)
219+
SCode.MOD(false,[],SOME(Absyn.REAL(0.0))),NONE,NONE)
220220

221221
val integer_start = SCode.COMPONENT("start",true,false,false,
222222
SCode.ATTR([],
@@ -225,7 +225,7 @@ val integer_start = SCode.COMPONENT("start",true,false,false,
225225
SCode.PARAM,
226226
Absyn.BIDIR),
227227
Absyn.IDENT("IntegerType"),
228-
SCode.MOD(false,[],SOME(Absyn.INTEGER(0))),NONE)
228+
SCode.MOD(false,[],SOME(Absyn.INTEGER(0))),NONE,NONE)
229229

230230
val string_start = SCode.COMPONENT("start",true,false,false,
231231
SCode.ATTR([],
@@ -234,7 +234,7 @@ val string_start = SCode.COMPONENT("start",true,false,false,
234234
SCode.PARAM,
235235
Absyn.BIDIR),
236236
Absyn.IDENT("StringType"),
237-
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE)
237+
SCode.MOD(false,[],SOME(Absyn.STRING(""))),NONE,NONE)
238238

239239
val boolean_start = SCode.COMPONENT("start",true,false,false,
240240
SCode.ATTR([],
@@ -243,7 +243,7 @@ val boolean_start = SCode.COMPONENT("start",true,false,false,
243243
SCode.PARAM,
244244
Absyn.BIDIR),
245245
Absyn.IDENT("BooleanType"),
246-
SCode.MOD(false,[],SOME(Absyn.BOOL(false))),NONE)
246+
SCode.MOD(false,[],SOME(Absyn.BOOL(false))),NONE,NONE)
247247

248248
val fixed = SCode.COMPONENT("fixed",true,false,false,
249249
SCode.ATTR([],
@@ -252,7 +252,7 @@ val fixed = SCode.COMPONENT("fixed",true,false,false,
252252
SCode.PARAM,
253253
Absyn.BIDIR),
254254
Absyn.IDENT("BooleanType"),
255-
SCode.MOD(false,[],SOME(Absyn.BOOL(false))),NONE)
255+
SCode.MOD(false,[],SOME(Absyn.BOOL(false))),NONE,NONE)
256256
(* Should be true for variables*)
257257

258258
val nominal = SCode.COMPONENT("nominal",true,false,false,
@@ -262,7 +262,7 @@ val nominal = SCode.COMPONENT("nominal",true,false,false,
262262
SCode.PARAM,
263263
Absyn.BIDIR),
264264
Absyn.IDENT("RealType"),
265-
SCode.MOD(false,[],NONE),NONE)
265+
SCode.MOD(false,[],NONE),NONE,NONE)
266266

267267
val state_select = SCode.COMPONENT("stateSelect",true,false,false,
268268
SCode.ATTR([],
@@ -271,16 +271,18 @@ val state_select = SCode.COMPONENT("stateSelect",true,false,false,
271271
SCode.PARAM,
272272
Absyn.BIDIR),
273273
Absyn.IDENT("StateSelect"),
274-
SCode.MOD(false,[],SOME(Absyn.CREF(Absyn.CREF_QUAL("StateSelect",[],Absyn.CREF_IDENT("default",[]))))),NONE)
274+
SCode.MOD(false,[],
275+
SOME(Absyn.CREF(Absyn.CREF_QUAL("StateSelect",[],Absyn.CREF_IDENT("default",[]))))),
276+
NONE,NONE)
275277

276278
(* The StateSelect enumeration *)
277279
val state_select_comps =
278280
[
279-
SCode.COMPONENT("never",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE),
280-
SCode.COMPONENT("avoid",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE),
281-
SCode.COMPONENT("default",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE),
282-
SCode.COMPONENT("prefer",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE),
283-
SCode.COMPONENT("always",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE)
281+
SCode.COMPONENT("never",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE,NONE),
282+
SCode.COMPONENT("avoid",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE,NONE),
283+
SCode.COMPONENT("default",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE,NONE),
284+
SCode.COMPONENT("prefer",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE,NONE),
285+
SCode.COMPONENT("always",true,false,false,SCode.ATTR([],false,SCode.RO,SCode.CONST,Absyn.BIDIR),Absyn.IDENT("EnumType"),SCode.NOMOD,NONE,NONE)
284286
]
285287

286288
val state_select_type =

0 commit comments

Comments
 (0)