Fix peg_generator compiler warnings under MSVC (GH-20405)

miss-islington · ammaraskar · web-flow · commit fda47659bbc2 · 2020-05-25T21:52:21.000-07:00
(cherry picked from commit a2bbedc) Co-authored-by: Ammar Askar <ammar@ammaraskar.com>
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -32,10 +32,6 @@
                || c == '_'\
                || (c >= 128))
 
-extern char *PyOS_Readline(FILE *, FILE *, const char *);
-/* Return malloc'ed string including trailing \n;
-   empty malloc'ed string for EOF;
-   NULL if interrupted */
 
 /* Don't ever change this -- it would break the portability of Python code */
 #define TABSIZE 8
diff --git a/Tools/peg_generator/peg_extension/peg_extension.c b/Tools/peg_generator/peg_extension/peg_extension.c
@@ -96,21 +96,21 @@ parse_string(PyObject *self, PyObject *args, PyObject *kwds)
 }
 
 static PyObject *
-clear_memo_stats()
+clear_memo_stats(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(ignored))
 {
     _PyPegen_clear_memo_statistics();
     Py_RETURN_NONE;
 }
 
 static PyObject *
-get_memo_stats()
+get_memo_stats(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(ignored))
 {
     return _PyPegen_get_memo_statistics();
 }
 
 // TODO: Write to Python's sys.stdout instead of C's stdout.
 static PyObject *
-dump_memo_stats()
+dump_memo_stats(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(ignored))
 {
     PyObject *list = _PyPegen_get_memo_statistics();
     if (list == NULL) {
@@ -124,7 +124,7 @@ dump_memo_stats()
             break;
         }
         if (count > 0) {
-            printf("%4ld %9ld\n", i, count);
+            printf("%4zd %9ld\n", i, count);
         }
     }
     Py_DECREF(list);

Original file line number	Diff line number	Diff line change
`@@ -96,21 +96,21 @@ parse_string(PyObject self, PyObject args, PyObject *kwds)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`static PyObject *`
`99`		`-clear_memo_stats()`
	`99`	`+clear_memo_stats(PyObject Py_UNUSED(self), PyObject Py_UNUSED(ignored))`
`100`	`100`	`{`
`101`	`101`	`_PyPegen_clear_memo_statistics();`
`102`	`102`	`Py_RETURN_NONE;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`static PyObject *`
`106`		`-get_memo_stats()`
	`106`	`+get_memo_stats(PyObject Py_UNUSED(self), PyObject Py_UNUSED(ignored))`
`107`	`107`	`{`
`108`	`108`	`return _PyPegen_get_memo_statistics();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// TODO: Write to Python's sys.stdout instead of C's stdout.`
`112`	`112`	`static PyObject *`
`113`		`-dump_memo_stats()`
	`113`	`+dump_memo_stats(PyObject Py_UNUSED(self), PyObject Py_UNUSED(ignored))`
`114`	`114`	`{`
`115`	`115`	`PyObject *list = _PyPegen_get_memo_statistics();`
`116`	`116`	`if (list == NULL) {`
`@@ -124,7 +124,7 @@ dump_memo_stats()`
`124`	`124`	`break;`
`125`	`125`	`}`
`126`	`126`	`if (count > 0) {`
`127`		`- printf("%4ld %9ld\n", i, count);`
	`127`	`+ printf("%4zd %9ld\n", i, count);`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`Py_DECREF(list);`