Skip to content

Commit 7413e81

Browse files
jlefflerjleffler
committed
Version 8.0.2 - bug fix release.
See the README.md file: fixes GitHub issue #2 reported by Oleg Skinderev on 2022-05-28.
1 parent c4a31a4 commit 7413e81

34 files changed

+167
-75
lines changed

‎Output/scc-test.example2-c++98-c-n.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/* Mainly for testing */

‎Output/scc-test.example2-c++98-c.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010
/* Mainly for testing */
1111
/* Retained comments */

‎Output/scc-test.example2-c90-c-n.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/* Mainly for testing */

‎Output/scc-test.example2-c90-c.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010
/* Mainly for testing */
1111
/* Retained comments */

‎Output/scc-test.example2-c99-c-n.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/* Mainly for testing */

‎Output/scc-test.example2-c99-c.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010
/* Mainly for testing */
1111
/* Retained comments */

‎Output/scc-test.rawstring-c++11.1

+18-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef lint
1414

1515
extern const char jlss_id_scc_rawstring_cpp[];
16-
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c++11.1,v 8.1 2022/05/21 19:18:57 jonathanleffler Exp $";
16+
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c++11.1,v 8.2 2022/05/30 00:58:35 jonathanleffler Exp $";
1717
#endif
1818

1919

@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
190190
static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
191191
static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
192192
#endif
193+
194+
#if defined(STRING_TYPE_DEFINED)
195+
196+
197+
198+
199+
string str1 = "RC-21\'\\\\M2";
200+
string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
201+
string str3 = 'R\\\\M2';
202+
string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
203+
204+
205+
string str1 = "RC-21\'\\\\2";
206+
string str2 = "\"\\\\\'\t\\\"\\\\\"";
207+
string str3 = 'R\\\\2';
208+
string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
209+
#endif

‎Output/scc-test.rawstring-c++14.1

+18-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef lint
1414

1515
extern const char jlss_id_scc_rawstring_cpp[];
16-
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c++14.1,v 8.1 2022/05/21 19:18:57 jonathanleffler Exp $";
16+
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c++14.1,v 8.2 2022/05/30 00:58:35 jonathanleffler Exp $";
1717
#endif
1818

1919

@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
190190
static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
191191
static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
192192
#endif
193+
194+
#if defined(STRING_TYPE_DEFINED)
195+
196+
197+
198+
199+
string str1 = "RC-21\'\\\\M2";
200+
string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
201+
string str3 = 'R\\\\M2';
202+
string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
203+
204+
205+
string str1 = "RC-21\'\\\\2";
206+
string str2 = "\"\\\\\'\t\\\"\\\\\"";
207+
string str3 = 'R\\\\2';
208+
string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
209+
#endif

‎Output/scc-test.rawstring-c++17.1

+18-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef lint
1414

1515
extern const char jlss_id_scc_rawstring_cpp[];
16-
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c++17.1,v 8.1 2022/05/21 19:18:57 jonathanleffler Exp $";
16+
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c++17.1,v 8.2 2022/05/30 00:58:35 jonathanleffler Exp $";
1717
#endif
1818

1919

@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
190190
static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
191191
static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
192192
#endif
193+
194+
#if defined(STRING_TYPE_DEFINED)
195+
196+
197+
198+
199+
string str1 = "RC-21\'\\\\M2";
200+
string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
201+
string str3 = 'R\\\\M2';
202+
string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
203+
204+
205+
string str1 = "RC-21\'\\\\2";
206+
string str2 = "\"\\\\\'\t\\\"\\\\\"";
207+
string str3 = 'R\\\\2';
208+
string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
209+
#endif

‎Output/scc-test.rawstring-c11.1

+18-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef lint
1414

1515
extern const char jlss_id_scc_rawstring_cpp[];
16-
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c11.1,v 8.1 2022/05/21 19:18:57 jonathanleffler Exp $";
16+
const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c11.1,v 8.2 2022/05/30 00:58:35 jonathanleffler Exp $";
1717
#endif
1818

1919

@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
190190
static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
191191
static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
192192
#endif
193+
194+
#if defined(STRING_TYPE_DEFINED)
195+
196+
197+
198+
199+
string str1 = "RC-21\'\\\\M2";
200+
string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
201+
string str3 = 'R\\\\M2';
202+
string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
203+
204+
205+
string str1 = "RC-21\'\\\\2";
206+
string str2 = "\"\\\\\'\t\\\"\\\\\"";
207+
string str3 = 'R\\\\2';
208+
string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
209+
#endif

‎Output/scc.test-08.example2-ec.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Test SCC on core functionality
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1997,2003,2007,2013-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010
/* Mainly for testing */
1111
/* Retained comments */

‎README.md

+14-5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ described in [Remove Comments from C/C++
66
Code](http://stackoverflow.com/questions/2394017/) on Stack Overflow.
77

88
There are currently 8 releases:
9+
* 8.0.2 (2022-05-30) - stable release
910
* 8.0.1 (2022-05-21) - stable release
1011
* 6.80 (2017-10-26) - stable release
1112
* 6.70 (2017-10-17) - stable release
@@ -18,17 +19,25 @@ There are currently 8 releases:
1819

1920
These are tagged release/x.yz. The code is all on branch master.
2021

22+
### Version 8.0.2 - 2022-05-30
23+
24+
A bug fix release, dealing with GitHub issue 2, a bug in the handling of
25+
regular strings (and also character constants) reported by Oleg
26+
Skinderev.
27+
2128
### Version 8.0.1 - 2022-05-21
2229

23-
Primarily a bug fix release, dealing with a problem in C++ 'raw string'
24-
handling reported by Oleg Skinderev via GitHub.
30+
Primarily a bug fix release, dealing with GitHub issue 1, a bug in C++
31+
'raw string' handling reported by Oleg Skinderev.
2532

26-
However, prior to that, 'internal' releases 7.00 (2018-11-1), 7.10
33+
However, prior to that, 'internal' releases 7.00 (2018-11-11), 7.10
2734
(2018-11-12), 7.20 (2018-11-21), 7.30 (2019-01-27), 7.40 (2019-05-01)
2835
7.50 (2020-03-03), 7.80.0 (2022-01-06) and 8.0.0 (2022-04-07) had been
2936
created.
3037
These versions are not directly reflected in this Git repository, but
3138
the changes are present in 8.0.1.
39+
If you have an urgent need for intermediate versions (why?), contact
40+
Jonathan Leffler by email.
3241

3342
By default, SCC now strips trailing blanks; use the `-t` option to keep
3443
them.
@@ -37,8 +46,8 @@ preprocessing number, even though it is isn't a valid octal constant.
3746
The `-f` (features) option lists the features and exits (rather than
3847
trying to process a file too).
3948
The version numbering was changed to 'semantic versioning'
40-
(https://emver.org/) and is now managed independently of the RCS file
41-
version numbers (which is still used to manage the 'internal releases').
49+
(https://semver.org/) and is now managed independently of the RCS file
50+
version numbers (RCS is still used to manage the 'internal releases').
4251

4352
### Version 6.80 - 2017-10-26
4453

‎errhelp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Print usage and help message in standard format.
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 2007-2022
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/*TABSTOP=4*/

‎filter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Classic File Filter
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1987-89,1991,1993,1996-99,2002-05,2008,2012,2014-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/*TABSTOP=4*/

‎filter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Header for filter functions
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 1993,1995-98,2003-04,2006,2008,2014-15
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/*TABSTOP=4*/

‎filterio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Perform standardized I/O error check for filter programs
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 2003-2019
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/*TABSTOP=4*/

‎posixver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@(#)Purpose: Request appropriate POSIX and X/Open Support
66
@(#)Author: J Leffler
77
@(#)Copyright: (C) JLSS 2010-2017
8-
@(#)Product: SCC Version 8.0.1 (2022-05-21)
8+
@(#)Product: SCC Version 8.0.2 (2022-05-29)
99
*/
1010

1111
/*TABSTOP=4*/

‎scc-8.0.1.sum

-1
This file was deleted.

0 commit comments

Comments
 (0)