I should fix these copyright headers too...

zeroc-ice · Dec 17, 2024 · a01283c · a01283c
1 parent 7378332
commit a01283c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 46 deletions.
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
@@ -1,14 +1,12 @@
 #line 2 "src/IceGrid/Scanner.cpp"
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #include "../Ice/ScannerConfig.h"
 #include <cstdint>
 
 // NOLINTBEGIN
 
-#line 12 "src/IceGrid/Scanner.cpp"
+#line 10 "src/IceGrid/Scanner.cpp"
 
 #define  YY_INT_ALIGNED long int
 
@@ -471,7 +469,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "src/IceGrid/Scanner.l"
 
-#line 14 "src/IceGrid/Scanner.l"
+#line 12 "src/IceGrid/Scanner.l"
 
 #include "Ice/Ice.h"
 #include "Parser.h"
@@ -499,8 +497,8 @@ namespace IceGrid
 #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize)
 #define YY_FATAL_ERROR(msg) fatalError(msg);
 
-#line 503 "src/IceGrid/Scanner.cpp"
-#line 44 "src/IceGrid/Scanner.l"
+#line 501 "src/IceGrid/Scanner.cpp"
+#line 42 "src/IceGrid/Scanner.l"
   /* Instructs flex to not suppress any warnings when generating the scanner. */
   /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This
    * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */
@@ -512,7 +510,7 @@ namespace IceGrid
   /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */
   /* We always want the scanner to run in interactive mode. */
   /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */
-#line 516 "src/IceGrid/Scanner.cpp"
+#line 514 "src/IceGrid/Scanner.cpp"
 
 #define INITIAL 0
 
@@ -713,10 +711,10 @@ YY_DECL
 		}
 
 	{
-#line 75 "src/IceGrid/Scanner.l"
+#line 73 "src/IceGrid/Scanner.l"
 
 
-#line 720 "src/IceGrid/Scanner.cpp"
+#line 718 "src/IceGrid/Scanner.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -775,7 +773,7 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 77 "src/IceGrid/Scanner.l"
+#line 75 "src/IceGrid/Scanner.l"
 {
     // C++-style comment
     int c;
@@ -788,7 +786,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 87 "src/IceGrid/Scanner.l"
+#line 85 "src/IceGrid/Scanner.l"
 {
     // C-style comment
     while (true)
@@ -817,7 +815,7 @@ YY_RULE_SETUP
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 112 "src/IceGrid/Scanner.l"
+#line 110 "src/IceGrid/Scanner.l"
 {
     size_t len = strlen(yytext);
     for (size_t i = 0; i < len; ++i)
@@ -832,14 +830,14 @@ YY_RULE_SETUP
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 123 "src/IceGrid/Scanner.l"
+#line 121 "src/IceGrid/Scanner.l"
 {
     return ';';
 }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 127 "src/IceGrid/Scanner.l"
+#line 125 "src/IceGrid/Scanner.l"
 {
     // "..."-type strings
     string s = parseDoubleQuotedString();
@@ -850,7 +848,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 135 "src/IceGrid/Scanner.l"
+#line 133 "src/IceGrid/Scanner.l"
 {
     // '...'-type strings
     string s;
@@ -878,7 +876,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 160 "src/IceGrid/Scanner.l"
+#line 158 "src/IceGrid/Scanner.l"
 {
     // Simple strings
     string s;
@@ -917,10 +915,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 196 "src/IceGrid/Scanner.l"
+#line 194 "src/IceGrid/Scanner.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 924 "src/IceGrid/Scanner.cpp"
+#line 922 "src/IceGrid/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1765,7 +1763,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 196 "src/IceGrid/Scanner.l"
+#line 194 "src/IceGrid/Scanner.l"
 
 
 // NOLINTEND

diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
@@ -1,7 +1,5 @@
 %top{
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #include "../Ice/ScannerConfig.h"
 #include <cstdint>

diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
@@ -1,14 +1,12 @@
 #line 2 "src/IceStorm/Scanner.cpp"
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #include "../Ice/ScannerConfig.h"
 #include <cstdint>
 
 // NOLINTBEGIN
 
-#line 12 "src/IceStorm/Scanner.cpp"
+#line 10 "src/IceStorm/Scanner.cpp"
 
 #define  YY_INT_ALIGNED long int
 
@@ -471,7 +469,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "src/IceStorm/Scanner.l"
 
-#line 14 "src/IceStorm/Scanner.l"
+#line 12 "src/IceStorm/Scanner.l"
 
 #include "Ice/Ice.h"
 #include "Parser.h"
@@ -497,8 +495,8 @@ namespace IceStorm
 #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize)
 #define YY_FATAL_ERROR(msg) fatalError(msg);
 
-#line 501 "src/IceStorm/Scanner.cpp"
-#line 42 "src/IceStorm/Scanner.l"
+#line 499 "src/IceStorm/Scanner.cpp"
+#line 40 "src/IceStorm/Scanner.l"
   /* Instructs flex to not suppress any warnings when generating the scanner. */
   /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This
    * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */
@@ -510,7 +508,7 @@ namespace IceStorm
   /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */
   /* We always want the scanner to run in interactive mode. */
   /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */
-#line 514 "src/IceStorm/Scanner.cpp"
+#line 512 "src/IceStorm/Scanner.cpp"
 
 #define INITIAL 0
 
@@ -711,10 +709,10 @@ YY_DECL
 		}
 
 	{
-#line 73 "src/IceStorm/Scanner.l"
+#line 71 "src/IceStorm/Scanner.l"
 
 
-#line 718 "src/IceStorm/Scanner.cpp"
+#line 716 "src/IceStorm/Scanner.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -773,7 +771,7 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 75 "src/IceStorm/Scanner.l"
+#line 73 "src/IceStorm/Scanner.l"
 {
     // C++-style comment
     int c;
@@ -786,7 +784,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 85 "src/IceStorm/Scanner.l"
+#line 83 "src/IceStorm/Scanner.l"
 {
     // C-style comment
     while (true)
@@ -815,7 +813,7 @@ YY_RULE_SETUP
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 110 "src/IceStorm/Scanner.l"
+#line 108 "src/IceStorm/Scanner.l"
 {
     size_t len = strlen(yytext);
     for (size_t i = 0; i < len; ++i)
@@ -830,14 +828,14 @@ YY_RULE_SETUP
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 121 "src/IceStorm/Scanner.l"
+#line 119 "src/IceStorm/Scanner.l"
 {
     return ';';
 }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 125 "src/IceStorm/Scanner.l"
+#line 123 "src/IceStorm/Scanner.l"
 {
     // "..."-type strings
     string s;
@@ -884,7 +882,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 169 "src/IceStorm/Scanner.l"
+#line 167 "src/IceStorm/Scanner.l"
 {
     // '...'-type strings
     string s;
@@ -912,7 +910,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 194 "src/IceStorm/Scanner.l"
+#line 192 "src/IceStorm/Scanner.l"
 {
     // Simple strings
     string s;
@@ -942,10 +940,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 221 "src/IceStorm/Scanner.l"
+#line 219 "src/IceStorm/Scanner.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 949 "src/IceStorm/Scanner.cpp"
+#line 947 "src/IceStorm/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1790,7 +1788,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 221 "src/IceStorm/Scanner.l"
+#line 219 "src/IceStorm/Scanner.l"
 
 
 // NOLINTEND

diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
@@ -1,7 +1,5 @@
 %top{
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #include "../Ice/ScannerConfig.h"
 #include <cstdint>