blob: 7392fbf33f910ef7af961ff2ed5919d94da5429c (
plain) (
blame)
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
|
From ac587957cd0cabbc668604507e2cfebb6810ed09 Mon Sep 17 00:00:00 2001
From: Milian Wolff <mail@milianw.de>
Date: Thu, 29 Nov 2012 15:56:40 +0100
Subject: [PATCH 11/17] fix some warnings
---
kdev-pg/kdev-pg-code-gen.cpp | 2 +-
kdev-pg/kdev-pg-lexer.ll | 2 +-
kdev-pg/kdev-pg-parser.yy | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
index e06c6be..badb461 100644
--- a/kdev-pg/kdev-pg-code-gen.cpp
+++ b/kdev-pg/kdev-pg-code-gen.cpp
@@ -51,7 +51,7 @@ namespace KDevPG
void generateCondition(const World::NodeSet& s, QTextStream& out)
{
- if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
+ if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
{
out << "true /*epsilon*/";
return;
diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
index a0864af..9261d71 100644
--- a/kdev-pg/kdev-pg-lexer.ll
+++ b/kdev-pg/kdev-pg-lexer.ll
@@ -425,7 +425,7 @@ void appendLineBuffer()
strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
/* strcpy is faster than strcat */
- Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
+ Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
lastTextLeng = strlen(yytext);
yymoreFlag = false;
diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
index d5a25f5..8f8d604 100644
--- a/kdev-pg/kdev-pg-parser.yy
+++ b/kdev-pg/kdev-pg-parser.yy
@@ -309,7 +309,7 @@ opt_lexer_action
| T_CONTINUE {
r = "\nlxCONTINUE;\n";
}
- | /* empty */ { r = "\nlxSKIP\n" }
+ | /* empty */ { r = "\nlxSKIP\n"; }
;
regexp
--
1.9.3
|
