Skip to content

Commit 464c131

Browse files
committed
Changed modeq to omc everyhwere, updated source. Renamed build directories for modeq to omc. Updated VC7 projects and solution as well.
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@1799 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent ece3a3a commit 464c131

33 files changed

+448
-435
lines changed

Compiler/.cvsignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
Makefile
99
modelica.pdf
1010
modelica.ps
11-
modeq.exe
11+
omc.exe
1212
old-modelica.rml

Compiler/Absyn.rml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
** for printing the AST.
116116
**
117117
** absyn.rml's constructors are primarily used by the walker
118-
** (modeq/absyn_builder/walker.g) which takes an ANTLR internal syntax tree and
118+
** (Compiler/absyn_builder/walker.g) which takes an ANTLR internal syntax tree and
119119
** converts it into an RML abstract syntax tree.
120120
**
121121
** When the AST has been built, it is normaly used by explode.rml in order to

Compiler/Builtin.rml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ relation initial_env =
11801180
Env.extend_frame_t(env, "array", n7real2arrayreal) => env &
11811181
Env.extend_frame_t(env, "array", n8real2arrayreal) => env &
11821182

1183-
(* Fill is impossible to do with this scemen, because the type of the array is unkown during the compile time of Modeq.
1183+
(* Fill is impossible to do with this scemen, because the type of the array is unkown during the compile time of omc.
11841184

11851185
Env.extend_frame_t(env, "fill", array2int) => env &
11861186
*)

Compiler/Ceval.rml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ end
13301330
=> (Values.BOOL(true),Interactive.SYMBOLTABLE(newp,sp,[],iv,cf))
13311331

13321332
(** it the rule above have failed then check if file exists **)
1333-
(* without this modeq crashes *)
1333+
(* without this omc crashes *)
13341334
rule System.regular_file_exist(name) => rest &
13351335
int_gt(rest,0) => true
13361336
---------------------------------------------------

Compiler/Interactive.rml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ relation evaluate_graphical_api: (InteractiveStmts, InteractiveSymbolTable) =>
685685

686686

687687
(** it the rule above have failed then check if file exists **)
688-
(* without this modeq crashes *)
688+
(* without this omc crashes *)
689689
rule System.regular_file_exist(name) => rest &
690690
int_gt(rest,0) => true
691691
---------------------------------------------------

Compiler/Main.rml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,10 @@ relation translate_file : string list => () =
480480
----------------------------
481481
translate_file _::_::_ => fail
482482

483-
rule Print.print_buf "Usage: modeq <options> filename \n" &
484-
Print.print_buf "modeq accepts .mo (Modelica files) \n" &
485-
Print.print_buf " .mof (Flat Modelica files) \n" &
486-
Print.print_buf " .mos (Modelica Script files) \n" &
483+
rule Print.print_buf "Usage: omc <options> filename \n" &
484+
Print.print_buf "omc accepts .mo (Modelica files) \n" &
485+
Print.print_buf " .mof (Flat Modelica files) \n" &
486+
Print.print_buf " .mos (Modelica Script files) \n" &
487487
Print.print_buf "Options:\n========" &
488488
Print.print_buf "+s Generate simulation code\n" &
489489
Print.print_buf "+q Run in quiet mode, ouput nothing\n" &

Compiler/Makefile.common

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Common part of Makefile for modeq. Contains sourcenames.
2+
# Common part of Makefile for omc. Contains sourcenames.
33
#
44
# David K�gedal <x97davka@ida.liu.se>
55
#
@@ -8,8 +8,8 @@
88

99

1010
ifdef USE_CORBA
11-
CORBAOBJ = $(srcdir)/runtime/corbaimpl.o $(srcdir)/runtime/modeq_communication_impl.o \
12-
$(srcdir)/runtime/modeq_communication.o
11+
CORBAOBJ = $(srcdir)/runtime/corbaimpl.o $(srcdir)/runtime/omc_communication_impl.o \
12+
$(srcdir)/runtime/omc_communication.o
1313
CORBALIB = -L$(CORBAHOME)/lib -lmico -lcrypto -lssl
1414
else
1515
CORBAOBJ = $(srcdir)/runtime/corbaimpl_stub.o

Compiler/Makefile.in

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Makefile for modeq
2+
# Makefile for omc
33
#
44
# David Kågedal <x97davka@ida.liu.se>
55
#
@@ -32,15 +32,15 @@ CORBAHOME = @CORBAHOME@
3232

3333
include Makefile.common
3434

35-
PROG = modeq
36-
PROGD = modeqd
35+
PROG = omc
36+
PROGD = omcd
3737

3838
#SUBDIRS= ast runtime
3939
SUBDIRS = runtime absyn_builder modpar
4040

4141
.SUFFIXES:
4242
.SUFFIXES: .o .rml .h
43-
.PHONY: all subdirs report vctarget debug release depend clean dclean test reallyclean modeq_release modeq_debug
43+
.PHONY: all subdirs report vctarget debug release depend clean dclean test reallyclean omc_release omc_debug
4444

4545
#all : debug
4646
all : release
@@ -49,33 +49,33 @@ debug: $(PROGD) $(SRCRDB)
4949

5050
release: $(PROG)
5151

52-
$(SRCRDB): %.rdb: modeq_debug/%.rdb
52+
$(SRCRDB): %.rdb: omc_debug/%.rdb
5353
cp $< $@
5454

5555
# @for x in $(SRCRDB); do \
5656
# echo $$x;
57-
# cp modeq_debug/$$x .; \
57+
# cp omc_debug/$$x .; \
5858
# done
5959

60-
$(PROG): modeq_release
61-
cp modeq_release/$(PROG)$(EXEEXT) .
60+
$(PROG): omc_release
61+
cp omc_release/$(PROG)$(EXEEXT) .
6262

63-
$(PROGD): modeq_debug
64-
cp modeq_debug/$(PROGD)$(EXEEXT) .
63+
$(PROGD): omc_debug
64+
cp omc_debug/$(PROGD)$(EXEEXT) .
6565

66-
modeq_release:
67-
(cd modeq_release && $(MAKE))
66+
omc_release:
67+
(cd omc_release && $(MAKE))
6868

69-
modeq_debug:
70-
(cd modeq_debug && $(MAKE))
69+
omc_debug:
70+
(cd omc_debug && $(MAKE))
7171

7272

7373

7474
#vctarget:
75-
# @(cd modeq_debug ; $(MAKE) vctarget)
75+
# @(cd omc_debug ; $(MAKE) vctarget)
7676

7777
vctarget:
78-
@(cd modeq_release ; $(MAKE) vctarget)
78+
@(cd omc_release ; $(MAKE) vctarget)
7979

8080

8181

@@ -97,15 +97,15 @@ clean:
9797
@for d in $(SUBDIRS); do \
9898
(cd $$d ; $(MAKE) clean) \
9999
done
100-
(cd modeq_release; $(MAKE) clean)
100+
(cd omc_release; $(MAKE) clean)
101101
-$(RM) -f $(SRCH)
102102
-$(RM) -f $(PROG)$(EXEEXT)
103103

104104
dclean:
105105
@for d in $(SUBDIRS); do \
106106
(cd $$d ; $(MAKE) clean) \
107107
done
108-
(cd modeq_debug; $(MAKE) clean)
108+
(cd omc_debug; $(MAKE) clean)
109109
-$(RM) -f $(SRCRDB)
110110
-$(RM) -f $(SRCH)
111111
-$(RM) -f $(PROGD)$(EXEEXT)
@@ -115,15 +115,15 @@ reallyclean:
115115
@for d in $(SUBDIRS); do \
116116
(cd $$d ; $(MAKE) reallyclean) \
117117
done
118-
(cd modeq_release; $(MAKE) reallyclean)
118+
(cd omc_release; $(MAKE) reallyclean)
119119
-$(RM) -f $(SRCH)
120120
-$(RM) -f $(PROG)$(EXEEXT)
121121

122122
dreallyclean:
123123
@for d in $(SUBDIRS); do \
124124
(cd $$d ; $(MAKE) reallyclean) \
125125
done
126-
(cd modeq_debug; $(MAKE) reallyclean)
126+
(cd omc_debug; $(MAKE) reallyclean)
127127
-$(RM) -f $(SRCRDB)
128128
-$(RM) -f $(SRCH)
129129
-$(RM) -f $(PROGD)$(EXEEXT)

Compiler/Makefile.w32

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ SIGS= $(ALLRML:.rml=.sig)
1717

1818
.PHONY : all
1919

20-
all: VC7\Release\main.obj VC7\Release\modeqrml.lib
20+
all: VC7\Release\main.obj VC7\Release\omcrml.lib
2121

22-
VC7\Release\modeqrml.lib: $(OBJS)
23-
lib /NOLOGO /OUT:VC7\Release\modeqrml.lib $(OBJS)
22+
VC7\Release\omcrml.lib: $(OBJS)
23+
lib /NOLOGO /OUT:VC7\Release\omcrml.lib $(OBJS)
2424

2525
.rml.obj:
2626
$(RML) -Eplain $<
@@ -30,7 +30,7 @@ VC7\Release\main.obj: main.obj
3030
copy /B /Y main.obj VC7\Release\main.obj
3131

3232
clean:
33-
del /Q /F $(OBJS) $(SRCC) $(SRCH) $(SIGS) VC7\Release\main.obj VC7\Release\modeqrml.lib
33+
del /Q /F $(OBJS) $(SRCC) $(SRCH) $(SIGS) VC7\Release\main.obj VC7\Release\omcrml.lib
3434

3535

3636
Absyn.obj: Absyn.rml Debug.sig Dump.sig Util.sig Print.sig

Compiler/Socket.rml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
** RCS: $Id$
111111
**
112112
** This is the socket connection module of the compiler
113-
** Used in interactive mode if modeq is started with +d=interactive
113+
** Used in interactive mode if omc is started with +d=interactive
114114
** Implemented in ./runtime/soecketimpl.c
115115
** Not implemented in Win32 builds use +d=interactiveCorba instead.
116116
**)

0 commit comments

Comments
 (0)