Skip to content

Commit

Permalink
follow-up to [r5109] Use a two-pass algorithm for COPY-REPLACING and …
Browse files Browse the repository at this point in the history 
…then REPLACE

build_windows:
* general for cobc: include new replace.c
* version_cobc.rc: updated date + rev
  • Loading branch information
sf-mensch committed Jul 7, 2023
1 parent df33b84 commit 8bc9fed
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 7 deletions.
5 changes: 5 additions & 0 deletions build_windows/ChangeLog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

2023-07-07 Simon Sobisch <[email protected]>

* general for cobc: include new replace.c
* version_cobc.rc: updated date + rev

2023-06-30 Simon Sobisch <[email protected]>

* config.h.in: updated for OrangeC 6.0.70.2
Expand Down
1 change: 1 addition & 0 deletions build_windows/ocide/cobc.exe.cpj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<FILE NAME="..\..\cobc\parser.y" TITLE="parser.y" CLEAN="0"/>
<FILE NAME="..\..\cobc\ppparse.y" TITLE="ppparse.y" CLEAN="0"/>
<FILE NAME="..\..\cobc\reserved.c" TITLE="reserved.c" CLEAN="0"/>
<FILE NAME="..\..\cobc\replace.c" TITLE="replace.c" CLEAN="0"/>
<FILE NAME="..\..\cobc\tree.c" TITLE="tree.c" CLEAN="0"/>
<FILE NAME="..\..\cobc\typeck.c" TITLE="typeck.c" CLEAN="0"/>
</FOLDER>
Expand Down
4 changes: 2 additions & 2 deletions build_windows/version_cobc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "config.h"

#include "../libcob/version.h"
#define VCS_REF 5055
#define VCS_REF 5112

#define STRINGIZE_DETAIL_(v) #v
#define STRINGIZE(v) STRINGIZE_DETAIL_(v)
Expand Down Expand Up @@ -55,7 +55,7 @@ VS_VERSION_INFO VERSIONINFO
VALUE "SpecialBuild", ""

/* Non-Standard entries */
VALUE "Build", "May 2023"
VALUE "Build", "July 2023"
VALUE "Developer", "Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Edward Hart and many others (see AUTHORS and THANKS)"
VALUE "Support", "https://www.gnu.org/software/gnucobol/"
VALUE "Users", "Unlimited."
Expand Down
4 changes: 4 additions & 0 deletions build_windows/vs2005/cobc.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\cobc\replace.c"
>
</File>
<File
RelativePath="..\..\cobc\reserved.c"
>
Expand Down
4 changes: 4 additions & 0 deletions build_windows/vs2008/cobc.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\cobc\replace.c"
>
</File>
<File
RelativePath="..\..\cobc\reserved.c"
>
Expand Down
1 change: 1 addition & 0 deletions build_windows/vs2010/cobc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<ClCompile Include="..\..\cobc\error.c" />
<ClCompile Include="..\..\cobc\field.c" />
<ClCompile Include="..\..\cobc\help.c" />
<ClCompile Include="..\..\cobc\replace.c" />
<ClCompile Include="..\..\cobc\reserved.c" />
<ClCompile Include="..\..\cobc\tree.c" />
<ClCompile Include="..\..\cobc\typeck.c" />
Expand Down
3 changes: 3 additions & 0 deletions build_windows/vs2010/cobc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClCompile Include="..\..\cobc\field.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\replace.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\reserved.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions build_windows/vs2012/cobc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
<ClCompile Include="..\..\cobc\error.c" />
<ClCompile Include="..\..\cobc\field.c" />
<ClCompile Include="..\..\cobc\help.c" />
<ClCompile Include="..\..\cobc\replace.c" />
<ClCompile Include="..\..\cobc\reserved.c" />
<ClCompile Include="..\..\cobc\tree.c" />
<ClCompile Include="..\..\cobc\typeck.c" />
Expand Down
3 changes: 3 additions & 0 deletions build_windows/vs2012/cobc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClCompile Include="..\..\cobc\field.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\replace.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\reserved.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions build_windows/vs2013/cobc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
<ClCompile Include="..\..\cobc\error.c" />
<ClCompile Include="..\..\cobc\field.c" />
<ClCompile Include="..\..\cobc\help.c" />
<ClCompile Include="..\..\cobc\replace.c" />
<ClCompile Include="..\..\cobc\reserved.c" />
<ClCompile Include="..\..\cobc\tree.c" />
<ClCompile Include="..\..\cobc\typeck.c" />
Expand Down
3 changes: 3 additions & 0 deletions build_windows/vs2013/cobc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClCompile Include="..\..\cobc\field.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\replace.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\reserved.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions build_windows/vs2015/cobc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
<ClCompile Include="..\..\cobc\error.c" />
<ClCompile Include="..\..\cobc\field.c" />
<ClCompile Include="..\..\cobc\help.c" />
<ClCompile Include="..\..\cobc\replace.c" />
<ClCompile Include="..\..\cobc\reserved.c" />
<ClCompile Include="..\..\cobc\tree.c" />
<ClCompile Include="..\..\cobc\typeck.c" />
Expand Down
3 changes: 3 additions & 0 deletions build_windows/vs2015/cobc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClCompile Include="..\..\cobc\field.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\replace.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\reserved.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions build_windows/vs2017/cobc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
<ClCompile Include="..\..\cobc\error.c" />
<ClCompile Include="..\..\cobc\field.c" />
<ClCompile Include="..\..\cobc\help.c" />
<ClCompile Include="..\..\cobc\replace.c" />
<ClCompile Include="..\..\cobc\reserved.c" />
<ClCompile Include="..\..\cobc\tree.c" />
<ClCompile Include="..\..\cobc\typeck.c" />
Expand Down
3 changes: 3 additions & 0 deletions build_windows/vs2017/cobc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClCompile Include="..\..\cobc\field.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\replace.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\reserved.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions build_windows/vs2019/cobc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
<ClCompile Include="..\..\cobc\error.c" />
<ClCompile Include="..\..\cobc\field.c" />
<ClCompile Include="..\..\cobc\help.c" />
<ClCompile Include="..\..\cobc\replace.c" />
<ClCompile Include="..\..\cobc\reserved.c" />
<ClCompile Include="..\..\cobc\tree.c" />
<ClCompile Include="..\..\cobc\typeck.c" />
Expand Down
3 changes: 3 additions & 0 deletions build_windows/vs2019/cobc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClCompile Include="..\..\cobc\field.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\replace.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cobc\reserved.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
10 changes: 5 additions & 5 deletions cobc/typeck.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2126,9 +2126,9 @@ cb_check_word_length (unsigned int length, const char *word)
cb_error (_("word length exceeds maximum of %d characters: '%s'"),
COB_MAX_WORDLEN, word);
} else {
(void) cb_syntax_check (_("word length exceeds %d characters: '%s'"),
cb_word_length, word);
}
(void) cb_syntax_check (_("word length exceeds %d characters: '%s'"),
cb_word_length, word);
}
}
}

Expand Down Expand Up @@ -2886,7 +2886,7 @@ cb_build_const_start (struct cb_field *f, cb_tree x)
if (cb_field_variable_size (p)) {
cb_error (_("variable length item not allowed here"));
return cb_build_numeric_literal (0, "1", 0);
}
}
}
snprintf (buff, sizeof(buff), "%d", target->offset);
for (p = target; p; p = p->parent) {
Expand Down Expand Up @@ -10685,7 +10685,6 @@ validate_move (cb_tree src, cb_tree dst, const unsigned int is_value, int *move_
struct cb_field *fsrc;
struct cb_literal *l;
cb_tree loc;
cob_s64_t val;
size_t i;
size_t is_numeric_edited;
int src_scale_mod;
Expand Down Expand Up @@ -10915,6 +10914,7 @@ validate_move (cb_tree src, cb_tree dst, const unsigned int is_value, int *move_
|| fdst->usage == CB_USAGE_COMP_X
|| fdst->usage == CB_USAGE_COMP_N
|| fdst->usage == CB_USAGE_BINARY))) {
cob_s64_t val;
i = l->size - leftmost_significant;
if (i < 19) {
val = cb_get_long_long (src);
Expand Down

0 comments on commit 8bc9fed

Please sign in to comment.