Skip to content

Commit 856cedb

Browse files
author
x02lucpo
committed
changed the generated code so that now it have instead of x[1] $a$pointb$pointd. (a.b.d)
corrected a bug in System.string_replace git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2039 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 1edd1e9 commit 856cedb

File tree

8 files changed

+677
-518
lines changed

8 files changed

+677
-518
lines changed

Compiler/Ceval.rml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,21 +1791,21 @@ end
17911791

17921792
rule extract_file_prefix(env,fileprefix,st,msg) => filenameprefix &
17931793
Static.component_ref_to_path(cr) => classname &
1794-
SCode.elaborate(p) => p' &
1795-
Inst.instantiate_class(p',classname) => (dae', env) &
1796-
DAE.transform_if_eq_to_expr(dae') => (dae as DAE.DAE(dael)) &
1797-
Interactive.add_instantiated_class(ic,Interactive.INSTCLASS(classname,dael,env))
1794+
SCode.elaborate(p) => p' &
1795+
Inst.instantiate_class(p',classname) => (dae', env) &
1796+
DAE.transform_if_eq_to_expr(dae') => (dae as DAE.DAE(dael)) &
1797+
Interactive.add_instantiated_class(ic,Interactive.INSTCLASS(classname,dael,env))
17981798
=> ic' &
1799-
DAELow.lower(dae,true) => dlow &
1800-
Debug.fprint("bltdump","Lowered DAE:\n") &
1801-
Debug.fcall("bltdump", DAELow.dump,dlow) &
1802-
DAELow.incidence_matrix(dlow) => m &
1799+
DAELow.lower(dae,true) => dlow &
1800+
Debug.fprint("bltdump","Lowered DAE:\n") &
1801+
Debug.fcall("bltdump", DAELow.dump,dlow) &
1802+
DAELow.incidence_matrix(dlow) => m &
18031803
DAELow.transpose_matrix(m) => mT &
18041804
DAELow.matching_algorithm(dlow,m,mT,(DAELow.INDEX_REDUCTION,DAELow.EXACT))
18051805
=> (ass1,ass2,dlow',m,mT) &
1806-
DAELow.strong_components(m,mT,ass1,ass2) => (comps) &
1807-
DAELow.translate_dae (dlow') => indexed_dlow &
1808-
DAELow.calculate_values(indexed_dlow) => indexed_dlow' &
1806+
DAELow.strong_components(m,mT,ass1,ass2) => (comps) &
1807+
DAELow.translate_dae (dlow') => indexed_dlow &
1808+
DAELow.calculate_values(indexed_dlow) => indexed_dlow' &
18091809
Debug.fprint("bltdump","indexed DAE:\n") &
18101810
Debug.fcall("bltdump", DAELow.dump_incidence_matrix, m) &
18111811
Debug.fcall("bltdump", DAELow.dump_incidence_matrix_t, mT) &
@@ -1918,19 +1918,19 @@ relation build_model:(Env.Env,
19181918
Exp.Exp, (* component ref for model *)
19191919
Interactive.InteractiveSymbolTable,
19201920
Msg)
1921-
=> (string, (*classname*)
1922-
string, (*method*)
1923-
Interactive.InteractiveSymbolTable,
1924-
string) (*initfilename*) =
1921+
=> (string, (*classname*)
1922+
string, (*method*)
1923+
Interactive.InteractiveSymbolTable,
1924+
string) (*initfilename*) =
19251925

1926-
rule translate_model(env,cr,st',msg,fileprefix) => (ret_val, st,indexed_dlow',libs) &
1926+
rule translate_model(env,cr,st',msg,fileprefix) => (ret_val, st,indexed_dlow',libs) &
19271927
Static.component_ref_to_path(cr) => classname &
19281928
Absyn.path_string(classname) => cname_str &
19291929

19301930
Exp.unelab_cref(cr) => a_cref &
19311931
change_to_file_dir(a_cref,p) &
19321932
calculate_simulation_settings(env,exp,st,msg,cname_str) => (init_filename,starttime_r,
1933-
stoptime_r,stepsize_r,method_str) &
1933+
stoptime_r,stepsize_r,method_str) &
19341934

19351935
SimCodegen.generate_init_data(indexed_dlow',classname,init_filename,
19361936
starttime_r,stoptime_r,stepsize_r) &

0 commit comments

Comments
 (0)