patching cqp/lex.yy.c #10

PolMine · Jul 15, 2021 · 2dda352 · 2dda352
1 parent a44fa1e
commit 2dda352
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/prep/gitdiff_cqp.txt b/prep/gitdiff_cqp.txt
@@ -2,14 +2,14 @@ diff --git a/src/cwb/cqp/depend.mk b/src/cwb/cqp/depend.mk
 new file mode 100644
 index 0000000..e69de29
 diff --git a/src/cwb/cqp/parser.tab.c b/src/cwb/cqp/parser.tab.c
-index 8142a64..656b91f 100644
+index 13bebee..656b91f 100644
 --- a/src/cwb/cqp/parser.tab.c
 +++ b/src/cwb/cqp/parser.tab.c
 @@ -2943,7 +2943,7 @@ yyreduce:
    case 133:
  #line 819 "parser.y"
      { 
--int ok __attribute__((unused));;
+-                  int ok __attribute__((unused));;
 +                  int ok __attribute__((unused));
                    if ((yyvsp[(2) - (5)].cl) && generate_code) {
                      ok = SortSubcorpus((yyvsp[(2) - (5)].cl), (yyvsp[(3) - (5)].sortclause), ((yyvsp[(4) - (5)].ival) >= 1) ? (yyvsp[(4) - (5)].ival) : 1, &((yyvsp[(5) - (5)].redir)));

diff --git a/prep/patch.R b/prep/patch.R
@@ -260,7 +260,7 @@ replace <- list(
   "src/cwb/cl/lex.creg.c" = list("/\\*\\sifndef YY_NO_INPUT\\s\\*/", "", 1L),
   "src/cwb/cqp/lex.yy.c" = list("^\\s+static\\svoid\\syyunput\\s\\(int\\sc,char\\s\\*buf_ptr\\s+\\);", "  /*  static void yyunput (int c,char *buf_ptr  ); */", 1L),
   "src/cwb/cqp/parser.tab.c" = list('^(\\s*)cqpmessage\\(Error,\\s"CQP\\sSyntax\\sError:.*?",\\ss,\\sQueryBuffer\\);', '\\1cqpmessage(Error, "CQP Syntax Error: %s", s);', 1L),
-  "src/cwb/cqp/parser.tab.c" = list("^(\\s+)int\\sok", "\\1int ok __attribute__((unused));", 4L)
+  "src/cwb/cqp/parser.tab.c" = list("^(\\s+)int\\sok;", "\\1int ok __attribute__((unused));", 4L)
 )
 
 for (i in 1L:length(replace)){

diff --git a/prep/patch_report.html b/prep/patch_report.html
@@ -199,7 +199,7 @@ <h2>Apply patches</h2>
 <pre class="r"><code>point_of_departure &lt;- last_commit(repo)
 git2r::add(repo = repodir, path = &quot;src/cwb/*&quot;)
 commit(repo, message = &quot;CWB patched&quot;)</code></pre>
-<pre><code>## [5970e73] 2021-07-15: CWB patched</code></pre>
+<pre><code>## [b969421] 2021-07-15: CWB patched</code></pre>
 <pre class="r"><code>to_compare &lt;- last_commit(repo)</code></pre>
 </div>
 <div id="inspect-diffs" class="section level2">
@@ -229,14 +229,14 @@ <h4>cqp directory</h4>
 ## new file mode 100644
 ## index 0000000..e69de29
 ## diff --git a/src/cwb/cqp/parser.tab.c b/src/cwb/cqp/parser.tab.c
-## index 8142a64..656b91f 100644
+## index 13bebee..656b91f 100644
 ## --- a/src/cwb/cqp/parser.tab.c
 ## +++ b/src/cwb/cqp/parser.tab.c
 ## @@ -2943,7 +2943,7 @@ yyreduce:
 ##    case 133:
 ##  #line 819 &quot;parser.y&quot;
 ##      { 
-## -int ok __attribute__((unused));;
+## -                  int ok __attribute__((unused));;
 ## +                  int ok __attribute__((unused));
 ##                    if ((yyvsp[(2) - (5)].cl) &amp;&amp; generate_code) {
 ##                      ok = SortSubcorpus((yyvsp[(2) - (5)].cl), (yyvsp[(3) - (5)].sortclause), ((yyvsp[(4) - (5)].ival) &gt;= 1) ? (yyvsp[(4) - (5)].ival) : 1, &amp;((yyvsp[(5) - (5)].redir)));