From f2a23c892456d9337ee2cb531653f8ade188ce7c Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Tue, 9 Dec 2014 12:31:36 +0000 Subject: [PATCH] make sure that the app doesn't crash even if nonExist is used somewhere in the grammars --- .../org/grammaticalframework/ui/android/Translator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java index bd47f2cc7..fe318b49a 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java @@ -312,13 +312,19 @@ public class Translator { } catch (ParseError e) { output = translateByLookup(input); } + + if (output == null) + output = "% "; // make sure that we return something return new Pair>(output, exprs); } public String linearize(Expr expr) { Concr targetLang = getTargetConcr(); - return targetLang.linearize(expr); + String s = targetLang.linearize(expr); + if (s == null) + s = "% "; // make sure that we return something + return s; } public Object[] bracketedLinearize(Expr expr) {