Skip to content

Commit 20b14ee

Browse files
committed
- fixed Interactive.rml - get_class_information, missing a \" before class name in the returned string.
- fixed omc_interactive_api.txt to agree with latest changes - fixed interactive_api_attributes.mos to agree with latest changes - fixed loadFileInteractiveQualified.mos to agree with latest changes - small modification to OMDev related Makefile.omdev.mingw and rml2sig/rmldep-new.sh git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2215 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 317532e commit 20b14ee

File tree

2 files changed

+47
-41
lines changed

2 files changed

+47
-41
lines changed

Compiler/Interactive.rml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6304,7 +6304,7 @@ relation get_class_information:(Absyn.ComponentRef,
63046304
int_string(el) => str_eline &
63056305
int_string(ec) => str_ecol &
63066306
(* composing the final returned string *)
6307-
Util.string_append_list(["{\"",res,"\",",name,"\",",cmt,",\"", file,
6307+
Util.string_append_list(["{\"",res,"\",\"",name,"\",",cmt,",\"", file,
63086308
"\",{", strPartial,",",strFinal,",",strEncapsulated,"},{\"",
63096309
str_readonly,"\",",str_sline,",",str_scol,",",str_eline,",",str_ecol,"}}"]) => res'
63106310
----------------------------

Compiler/rml2sig/rmldep-new.sh

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
1-
#!/bin/sh
2-
#
3-
# rmldep: Generates a new signature if the old is different.
4-
# BEDNARSKI Andrzej
5-
# Last update: 11 June, 2003
6-
# Changed by Adrian Pop, adrpo@ida.liu.se, 2006-02-02
7-
#
8-
9-
date
10-
mydir="`dirname $0`"
11-
12-
if [ ! "$#" -eq 1 ]; then
13-
echo "Usage: $0 <file>.(mo|rml)";
14-
exit;
15-
fi
16-
17-
tmp_file="$1.$$"
18-
if [ "mo" = "${OMC_BUILD_FROM}" ]; then
19-
sig_file="`basename "$1" ".mo"`.sig"
20-
else
21-
sig_file="`basename "$1" ".rml"`.sig"
22-
fi
23-
24-
if [ ! -f $sig_file ]; then
25-
echo "Sig file does not exist...";
26-
rml -fdump-interface $1 > $sig_file;
27-
else
28-
echo "Generates tmp sig."
29-
rml -fdump-interface $1 > $tmp_file
30-
echo "Diffing"
31-
diff $tmp_file $sig_file > /dev/null
32-
if [ $? -eq 0 ]; then
33-
echo "Interface is the same"
34-
rm $tmp_file
35-
else
36-
echo "Interface has changed"
37-
\mv $tmp_file $sig_file
38-
fi
39-
fi
40-
date
1+
#!/bin/sh
2+
#
3+
# rmldep: Generates a new signature if the old is different.
4+
# BEDNARSKI Andrzej
5+
# Last update: 11 June, 2003
6+
# Changed by Adrian Pop, adrpo@ida.liu.se, 2006-02-02
7+
#
8+
9+
date
10+
mydir="`dirname $0`"
11+
12+
if [ -z "${OMDEV}" ]; then
13+
RML=rml
14+
else
15+
RML=${OMDEV}/tools/rml/bin/rml
16+
fi
17+
18+
if [ ! "$#" -eq 1 ]; then
19+
echo "Usage: $0 <file>.(mo|rml)";
20+
exit;
21+
fi
22+
23+
tmp_file="$1.$$"
24+
if [ "mo" = "${OMC_BUILD_FROM}" ]; then
25+
sig_file="`basename "$1" ".mo"`.sig"
26+
else
27+
sig_file="`basename "$1" ".rml"`.sig"
28+
fi
29+
30+
if [ ! -f $sig_file ]; then
31+
echo "Sig file does not exist...";
32+
${RML} -fdump-interface $1 > $sig_file;
33+
else
34+
echo "Generates tmp sig."
35+
${RML} -fdump-interface $1 > $tmp_file
36+
echo "Diffing"
37+
diff $tmp_file $sig_file > /dev/null
38+
if [ $? -eq 0 ]; then
39+
echo "Interface is the same"
40+
rm $tmp_file
41+
else
42+
echo "Interface has changed"
43+
\mv $tmp_file $sig_file
44+
fi
45+
fi
46+
date

0 commit comments

Comments
 (0)