Prox: parsing %-w1 and %+w1 correctly.
Change-Id: Ic8019628ef83fc7b9b3467fd1aa1bb4eafb9848c
diff --git a/src/main/antlr/cosmas/c2ps_opPROX.g b/src/main/antlr/cosmas/c2ps_opPROX.g
index f7a42f5..257ee95 100644
--- a/src/main/antlr/cosmas/c2ps_opPROX.g
+++ b/src/main/antlr/cosmas/c2ps_opPROX.g
@@ -49,10 +49,10 @@
-> {$v1.tree != null}? ^(DIST {$proxDirection.tree} {$v1.tree} {$m1.tree})
-> ^(DIST {$proxDirection.tree} {$v2.tree} {$m2.tree});
-proxDirection
- : (p='+'|m='-')? -> {$p != null}? ^(DIR PLUS)
- -> {$m != null}? ^(DIR MINUS)
- -> ^(DIR BOTH) ;
+proxDirection:
+ (p='+'|m='-')? -> {$p != null}? ^(DIR PLUS)
+ -> {$m != null}? ^(DIR MINUS)
+ -> ^(DIR BOTH) ;
/*
proxDistValue // proxDistMin ( ':' proxDistMax)? ;
: (m1=proxDistMin -> ^(DIST_RANGE VAL0 $m1)) (':' m2=proxDistMax -> ^(DIST_RANGE $m1 $m2))? ;
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java b/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
index ba98f24..ce7802f 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
@@ -108,8 +108,7 @@
boolean bDebug = false;
if (args.length < 2) {
- System.err
- .println("Usage: QuerySerializer \"query\" queryLanguage [-show]");
+ System.err.println("\nUsage: QuerySerializer \"query\" queryLanguage [-show]");
System.exit(1);
}
else {