Version 8.0.2 - bug fix release.

See the README.md file: fixes GitHub issue #2 reported by Oleg Skinderev on 2022-05-28.
jleffler · May 30, 2022 · 7413e81 · 7413e81
1 parent c4a31a4
commit 7413e81
Show file tree

Hide file tree

Showing 34 changed files with 167 additions and 75 deletions.
diff --git a/Output/scc-test.example2-c++98-c-n.1 b/Output/scc-test.example2-c++98-c-n.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /* Mainly for testing */

diff --git a/Output/scc-test.example2-c++98-c.1 b/Output/scc-test.example2-c++98-c.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 /* Mainly for testing */
 /* Retained comments */

diff --git a/Output/scc-test.example2-c90-c-n.1 b/Output/scc-test.example2-c90-c-n.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /* Mainly for testing */

diff --git a/Output/scc-test.example2-c90-c.1 b/Output/scc-test.example2-c90-c.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 /* Mainly for testing */
 /* Retained comments */

diff --git a/Output/scc-test.example2-c99-c-n.1 b/Output/scc-test.example2-c99-c-n.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /* Mainly for testing */

diff --git a/Output/scc-test.example2-c99-c.1 b/Output/scc-test.example2-c99-c.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 /* Mainly for testing */
 /* Retained comments */

diff --git a/Output/scc-test.rawstring-c++11.1 b/Output/scc-test.rawstring-c++11.1
@@ -13,7 +13,7 @@
 #ifndef lint
 
 extern const char jlss_id_scc_rawstring_cpp[];
-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 $";
+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 $";
 #endif
 
 
@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
 static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
 static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
 #endif
+
+#if defined(STRING_TYPE_DEFINED)
+
+
+
+
+string str1 = "RC-21\'\\\\M2";
+string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
+string str3 = 'R\\\\M2';
+string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
+
+
+string str1 = "RC-21\'\\\\2";
+string str2 = "\"\\\\\'\t\\\"\\\\\"";
+string str3 = 'R\\\\2';
+string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
+#endif
diff --git a/Output/scc-test.rawstring-c++14.1 b/Output/scc-test.rawstring-c++14.1
@@ -13,7 +13,7 @@
 #ifndef lint
 
 extern const char jlss_id_scc_rawstring_cpp[];
-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 $";
+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 $";
 #endif
 
 
@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
 static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
 static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
 #endif
+
+#if defined(STRING_TYPE_DEFINED)
+
+
+
+
+string str1 = "RC-21\'\\\\M2";
+string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
+string str3 = 'R\\\\M2';
+string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
+
+
+string str1 = "RC-21\'\\\\2";
+string str2 = "\"\\\\\'\t\\\"\\\\\"";
+string str3 = 'R\\\\2';
+string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
+#endif
diff --git a/Output/scc-test.rawstring-c++17.1 b/Output/scc-test.rawstring-c++17.1
@@ -13,7 +13,7 @@
 #ifndef lint
 
 extern const char jlss_id_scc_rawstring_cpp[];
-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 $";
+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 $";
 #endif
 
 
@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
 static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
 static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
 #endif
+
+#if defined(STRING_TYPE_DEFINED)
+
+
+
+
+string str1 = "RC-21\'\\\\M2";
+string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
+string str3 = 'R\\\\M2';
+string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
+
+
+string str1 = "RC-21\'\\\\2";
+string str2 = "\"\\\\\'\t\\\"\\\\\"";
+string str3 = 'R\\\\2';
+string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
+#endif
diff --git a/Output/scc-test.rawstring-c11.1 b/Output/scc-test.rawstring-c11.1
@@ -13,7 +13,7 @@
 #ifndef lint
 
 extern const char jlss_id_scc_rawstring_cpp[];
-const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c11.1,v 8.1 2022/05/21 19:18:57 jonathanleffler Exp $";
+const char jlss_id_scc_rawstring_cpp[] = "@(#)$Id: scc-test.rawstring-c11.1,v 8.2 2022/05/30 00:58:35 jonathanleffler Exp $";
 #endif
 
 
@@ -190,3 +190,20 @@ static regex incl2{R"/(\s*#\s*include\s*<([^>]*)>\s*)/"};
 static regex incl1{R"/(\s*#\s*include\s*"([^"]*)\s*)/"};
 static regex incl2{R"/(\s*#\s*include\s*<([^>]*)\s*)/"};
 #endif
+
+#if defined(STRING_TYPE_DEFINED)
+
+
+
+
+string str1 = "RC-21\'\\\\M2";
+string str2 = "\"\\r\\n\'\t\\\"\\\\\"";
+string str3 = 'R\\\\M2';
+string str4 = '\'\\r\"\\"\\n\t\\\'\\\\\'';
+
+
+string str1 = "RC-21\'\\\\2";
+string str2 = "\"\\\\\'\t\\\"\\\\\"";
+string str3 = 'R\\\\2';
+string str4 = '\'\\\"\\\\\t\\\'\\\\\'';
+#endif
diff --git a/Output/scc.test-08.example2-ec.1 b/Output/scc.test-08.example2-ec.1
@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 /* Mainly for testing */
 /* Retained comments */

diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ described in [Remove Comments from C/C++
 Code](http://stackoverflow.com/questions/2394017/) on Stack Overflow.
 
 There are currently 8 releases:
+* 8.0.2 (2022-05-30) - stable release
 * 8.0.1 (2022-05-21) - stable release
 * 6.80  (2017-10-26) - stable release
 * 6.70  (2017-10-17) - stable release
@@ -18,17 +19,25 @@ There are currently 8 releases:
 
 These are tagged release/x.yz.  The code is all on branch master.
 
+### Version 8.0.2 - 2022-05-30
+
+A bug fix release, dealing with GitHub issue 2, a bug in the handling of
+regular strings (and also character constants) reported by Oleg
+Skinderev.
+
 ### Version 8.0.1 - 2022-05-21
 
-Primarily a bug fix release, dealing with a problem in C++ 'raw string'
-handling reported by Oleg Skinderev via GitHub.
+Primarily a bug fix release, dealing with GitHub issue 1, a bug in C++
+'raw string' handling reported by Oleg Skinderev.
 
-However, prior to that, 'internal' releases 7.00 (2018-11-1), 7.10
+However, prior to that, 'internal' releases 7.00 (2018-11-11), 7.10
 (2018-11-12), 7.20 (2018-11-21), 7.30 (2019-01-27), 7.40 (2019-05-01)
 7.50 (2020-03-03), 7.80.0 (2022-01-06) and 8.0.0 (2022-04-07) had been
 created.
 These versions are not directly reflected in this Git repository, but
 the changes are present in 8.0.1.
+If you have an urgent need for intermediate versions (why?), contact
+Jonathan Leffler by email.
 
 By default, SCC now strips trailing blanks; use the `-t` option to keep
 them.
@@ -37,8 +46,8 @@ preprocessing number, even though it is isn't a valid octal constant.
 The `-f` (features) option lists the features and exits (rather than
 trying to process a file too).
 The version numbering was changed to 'semantic versioning'
-(https://emver.org/) and is now managed independently of the RCS file
-version numbers (which is still used to manage the 'internal releases').
+(https://semver.org/) and is now managed independently of the RCS file
+version numbers (RCS is still used to manage the 'internal releases').
 
 ### Version 6.80 - 2017-10-26
 

diff --git a/errhelp.c b/errhelp.c
@@ -5,7 +5,7 @@
 @(#)Purpose:        Print usage and help message in standard format.
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 2007-2022
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /*TABSTOP=4*/

diff --git a/filter.c b/filter.c
@@ -5,7 +5,7 @@
 @(#)Purpose:        Classic File Filter
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1987-89,1991,1993,1996-99,2002-05,2008,2012,2014-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /*TABSTOP=4*/

diff --git a/filter.h b/filter.h
@@ -5,7 +5,7 @@
 @(#)Purpose:        Header for filter functions
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1993,1995-98,2003-04,2006,2008,2014-15
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /*TABSTOP=4*/

diff --git a/filterio.c b/filterio.c
@@ -5,7 +5,7 @@
 @(#)Purpose:        Perform standardized I/O error check for filter programs
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 2003-2019
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /*TABSTOP=4*/

diff --git a/posixver.h b/posixver.h
@@ -5,7 +5,7 @@
 @(#)Purpose:        Request appropriate POSIX and X/Open Support
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 2010-2017
-@(#)Product:        SCC Version 8.0.1 (2022-05-21)
+@(#)Product:        SCC Version 8.0.2 (2022-05-29)
 */
 
 /*TABSTOP=4*/

diff --git a/scc-8.0.1.sum b/scc-8.0.1.sum