Changeset: de6ad32925eb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de6ad32925eb Modified Files: java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java Branch: default Log Message:
Resolving javac -Xlint warnings:
./nl/cwi/monetdb/mcl/parser/HeaderLineParser.java:94: warning: [fallthrough]
possible fall-through into case
case 'l':
^
./nl/cwi/monetdb/mcl/parser/HeaderLineParser.java:102: warning: [fallthrough]
possible fall-through into case
case 't':
^
./nl/cwi/monetdb/mcl/parser/HeaderLineParser.java:116: warning: [fallthrough]
possible fall-through into case
default:
^
./nl/cwi/monetdb/mcl/parser/TupleLineParser.java:144: warning: [fallthrough]
possible fall-through into case
default:
^
4 warnings
diffs (58 lines):
diff --git a/java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
--- a/java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
+++ b/java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
@@ -89,30 +89,29 @@ public class HeaderLineParser extends MC
{
getValues(chrLine, 2, pos - 3);
type = NAME;
- break;
}
+ break;
case 'l':
if (len - pos == 6 &&
source.regionMatches(pos + 1,
"length", 1, 5))
{
getIntValues(chrLine, 2, pos - 3);
type = LENGTH;
- break;
}
+ break;
case 't':
if (len - pos == 4 &&
source.regionMatches(pos + 1,
"type", 1, 3))
{
getValues(chrLine, 2, pos - 3);
type = TYPE;
- break;
} else if (len - pos == 10 &&
source.regionMatches(pos + 1,
"table_name", 1, 9))
{
getValues(chrLine, 2, pos - 3);
type = TABLE;
- break;
}
+ break;
default:
throw new MCLParseException("unknown header: " +
(new String(chrLine, pos, len -
pos)));
diff --git a/java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
--- a/java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
+++ b/java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
@@ -134,13 +134,15 @@ public class TupleLineParser extends MCL
try {
uesc.append((char)(Integer.parseInt("" + chrLine[pos] +
chrLine[pos + 1] + chrLine[pos + 2], 8)));
pos += 2;
-
break;
} catch (NumberFormatException e) {
// hmmm, this point should never be reached actually...
throw new AssertionError("Flow error, should never try
to parse non-number");
}
+
} else {
+
// do default action if number seems not to be correct
+
uesc.append(chrLine[pos]);
}
-
// do default action if number seems not to be correct
+
break;
default:
// this is wrong, just ignore the escape, and print the char
uesc.append(chrLine[pos]);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
