From 29458c8878cd9e89d26bee1b286f56d2ebca8273 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 29 Jun 2021 15:31:35 +0100 Subject: Remove line numbers fix for slice-parser --- .../0002-Fix-line-numbers-in-generated-code.patch | 85 ---------------------- 1 file changed, 85 deletions(-) delete mode 100644 dev-libs/slice-parser/0002-Fix-line-numbers-in-generated-code.patch (limited to 'dev-libs/slice-parser') diff --git a/dev-libs/slice-parser/0002-Fix-line-numbers-in-generated-code.patch b/dev-libs/slice-parser/0002-Fix-line-numbers-in-generated-code.patch deleted file mode 100644 index fde791b..0000000 --- a/dev-libs/slice-parser/0002-Fix-line-numbers-in-generated-code.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 2f673c4f9f2808a40dc0c29097ea60e3d3117a50 Mon Sep 17 00:00:00 2001 -From: Dan Goodliffe -Date: Mon, 14 Dec 2020 02:28:14 +0000 -Subject: [PATCH 2/2] Fix #line numbers in generated code - ---- - cpp/src/Slice/Grammar.cpp | 6 +++--- - cpp/src/Slice/Scanner.cpp | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/ice/cpp/src/Slice/Grammar.cpp b/ice/cpp/src/Slice/Grammar.cpp -index 3cb7c833df..063e632d58 100644 ---- a/ice/cpp/src/Slice/Grammar.cpp -+++ b/ice/cpp/src/Slice/Grammar.cpp -@@ -127,7 +127,7 @@ slice_error(const char* s) - - - /* Line 371 of yacc.c */ --#line 128 "src/Slice/Grammar.cpp" -+#line 131 "src/Slice/Grammar.cpp" - - # ifndef YY_NULL - # if defined __cplusplus && 201103L <= __cplusplus -@@ -237,7 +237,7 @@ int slice_parse (); - /* Copy the second part of user declarations. */ - - /* Line 390 of yacc.c */ --#line 238 "src/Slice/Grammar.cpp" -+#line 241 "src/Slice/Grammar.cpp" - - #ifdef short - # undef short -@@ -4556,7 +4556,7 @@ yyreduce: - - - /* Line 1792 of yacc.c */ --#line 4557 "src/Slice/Grammar.cpp" -+#line 4560 "src/Slice/Grammar.cpp" - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires -diff --git a/ice/cpp/src/Slice/Scanner.cpp b/ice/cpp/src/Slice/Scanner.cpp -index f9bb314f51..9f2aee79e7 100644 ---- a/ice/cpp/src/Slice/Scanner.cpp -+++ b/ice/cpp/src/Slice/Scanner.cpp -@@ -1,7 +1,7 @@ - #include --#line 2 "src/Slice/Scanner.cpp" -+#line 3 "src/Slice/Scanner.cpp" - --#line 4 "src/Slice/Scanner.cpp" -+#line 5 "src/Slice/Scanner.cpp" - - #define YY_INT_ALIGNED short int - -@@ -626,7 +626,7 @@ int checkIdentifier(string&); - - - --#line 626 "src/Slice/Scanner.cpp" -+#line 630 "src/Slice/Scanner.cpp" - - #define INITIAL 0 - #define BOMSCAN 1 -@@ -816,7 +816,7 @@ YY_DECL - #line 93 "src/Slice/Scanner.l" - - --#line 816 "src/Slice/Scanner.cpp" -+#line 820 "src/Slice/Scanner.cpp" - - if ( !(yy_init) ) - { -@@ -1403,7 +1403,7 @@ YY_RULE_SETUP - #line 527 "src/Slice/Scanner.l" - ECHO; - YY_BREAK --#line 1403 "src/Slice/Scanner.cpp" -+#line 1407 "src/Slice/Scanner.cpp" - case YY_STATE_EOF(INITIAL): - case YY_STATE_EOF(BOMSCAN): - case YY_STATE_EOF(MAINSCAN): --- -2.29.2 - -- cgit v1.2.3