Skip to content

Commit

Permalink
Fixed output
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@442 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
x97davka committed Sep 22, 1998
1 parent 2300138 commit 4d9529c
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions modeq/mod.rml
Expand Up @@ -72,21 +72,17 @@ relation elab_mod : (Env.Env, Prefix.Prefix, SCode.Mod) => Mod =

axiom elab_mod (_,_,SCode.NOMOD) => NOMOD

rule elab_submods (env,pre,subs) => subs' &
let res = MOD(final,subs',NONE) &
print " elab_mod " & SCode.print_mod m &
print " => " & print_mod res & print "\n"
rule elab_submods (env,pre,subs) => subs'
------------------------------------
elab_mod (env,pre,m as SCode.MOD(final,subs,NONE)) => res
elab_mod (env,pre,m as SCode.MOD(final,subs,NONE))
=> MOD(final,subs',NONE)

rule elab_submods (env,pre,subs) => subs' &
Static.elab_exp(env,e) => (e',prop) &
Prefix.prefix_exp(env,e',pre) => e'' &
let res = MOD(final,subs',SOME((e'',prop))) &
print " elab_mod " & SCode.print_mod m &
print " => " & print_mod res & print "\n"
Prefix.prefix_exp(env,e',pre) => e''
------------------------------------
elab_mod (env,pre,m as SCode.MOD(final,subs,SOME(e))) => res
elab_mod (env,pre,m as SCode.MOD(final,subs,SOME(e)))
=> MOD(final,subs',SOME((e'',prop)))

end

Expand Down Expand Up @@ -433,7 +429,7 @@ relation merge : (Mod, Mod) => Mod =

axiom merge(m,NOMOD) => m

rule print " ignoring inner modification\n"
rule print "- ignoring inner modification\n"
--------------------------------------
merge(m as REDECL(_,_),_) => m

Expand Down Expand Up @@ -482,8 +478,8 @@ relation merge_subs2 : (SubMod list, SubMod)

(* Modifications in the list take precedence *)

rule n1 = n2 & print " merge clash in " & print n1 & print "\n"
------------------------------------------------------------
rule n1 = n2
-------
merge_subs2((s1 as NAMEMOD(n1,m1))::ss,
NAMEMOD(n2,m2)) => (ss, s1)

Expand Down

0 comments on commit 4d9529c

Please sign in to comment.