1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
--- maude-2.6.orig/src/Mixfix/top.yy
+++ maude-2.6/src/Mixfix/top.yy
@@ -24,6 +24,8 @@
// Parser for Maude surface syntax.
//
+%parse-param {void* YYPARSE_PARAM}
+
%{
#include <string>
#include <stack>
@@ -91,7 +93,7 @@ SyntaxContainer* oldSyntaxContainer = 0;
Int64 number;
Int64 number2;
-static void yyerror(char *s);
+static void yyerror(void *, char *s);
void cleanUpModuleExpression();
void cleanUpParser();
--- maude-2.6.orig/src/Mixfix/bottom.yy
+++ maude-2.6/src/Mixfix/bottom.yy
@@ -23,7 +23,7 @@
%%
static void
-yyerror(char *s)
+yyerror(void *, char *s)
{
if (!(UserLevelRewritingContext::interrupted()))
IssueWarning(LineNumber(lineNumber) << ": " << s);
--- maude-2.6.orig/src/IO_Stuff/IO_Manager.cc
+++ maude-2.6/src/IO_Stuff/IO_Manager.cc
@@ -85,8 +85,8 @@ IO_Manager::setAutoWrap()
(void) cerr.rdbuf(wrapErr);
}
-int
-IO_Manager::getInput(char* buf, int maxSize, FILE* stream)
+size_t
+IO_Manager::getInput(char* buf, size_t maxSize, FILE* stream)
{
if (stream != stdin)
{
@@ -118,7 +118,7 @@ IO_Manager::getInput(char* buf, int maxS
return 0;
}
- int n;
+ size_t n;
for (n = 0;; n++)
{
char c = *line;
--- maude-2.6.orig/src/Mixfix/lexerAux.cc
+++ maude-2.6/src/Mixfix/lexerAux.cc
@@ -23,6 +23,9 @@
//
// Auxiliary functions and data needed by lexical analyzer.
//
+
+#include <stddef.h>
+
#define MAX_IN_DEPTH 10
int inStackPtr = 0;
@@ -35,14 +38,14 @@ bool fakeNewline = false; // fake \n fo
bool fakeNewlineStack[MAX_IN_DEPTH];
void
-getInput(char* buf, int& result, int max_size)
+getInput(char* buf, size_t& result, size_t max_size)
{
result = YY_NULL;
if (UserLevelRewritingContext::interrupted())
fakeNewline = false;
else
{
- int n = ioManager.getInput(buf, max_size, yyin);
+ size_t n = ioManager.getInput(buf, max_size, yyin);
if (UserLevelRewritingContext::interrupted())
fakeNewline = false;
else
--- maude-2.6.orig/src/Mixfix/lexerAux.hh
+++ maude-2.6/src/Mixfix/lexerAux.hh
@@ -27,7 +27,7 @@
//extern int inStackPtr;
//extern YY_BUFFER_STATE inStack[];
-void getInput(char* buf, int& result, int max_size);
+void getInput(char* buf, size_t& result, size_t max_size);
void lexerIdMode();
void lexerTokenTreeMode(int terminatingTokens);
void lexerCmdMode();
--- maude-2.6.orig/src/IO_Stuff/IO_Manager.hh
+++ maude-2.6/src/IO_Stuff/IO_Manager.hh
@@ -49,7 +49,7 @@ public:
void setPrompt(const string& newPrompt);
void setContPrompt(const string& newContPrompt);
void startCommand();
- int getInput(char* buf, int maxSize, FILE* stream);
+ size_t getInput(char* buf, size_t maxSize, FILE* stream);
private:
GetLine* gl;
--- maude-2.6.orig/src/Mixfix/commands.yy
+++ maude-2.6/src/Mixfix/commands.yy
@@ -23,12 +23,12 @@
/*
* Commands.
*/
-command : KW_SELECT { lexBubble(END_COMMAND, 1) }
+command : KW_SELECT { lexBubble(END_COMMAND, 1); }
endBubble
{
interpreter.setCurrentModule(lexerBubble);
}
- | KW_DUMP { lexBubble(END_COMMAND, 1) }
+ | KW_DUMP { lexBubble(END_COMMAND, 1); }
endBubble
{
if (interpreter.setCurrentModule(lexerBubble))
--- maude-2.6.orig/src/Mixfix/modules.yy
+++ maude-2.6/src/Mixfix/modules.yy
@@ -247,7 +247,7 @@ viewEndOpMap : ':'
// press on.
//
opDescription = lexerBubble;
- lexBubble(END_STATEMENT, 1)
+ lexBubble(END_STATEMENT, 1);
}
endBubble
{
|