summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/runtime/javascript/minibar/minibar.js33
-rw-r--r--src/server/PGFService.hs56
-rw-r--r--src/server/gwt/Fridge-compile3
-rw-r--r--src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java33
-rw-r--r--src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java16
-rw-r--r--src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java49
-rw-r--r--src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.css7
-rw-r--r--src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css7
8 files changed, 130 insertions, 74 deletions
diff --git a/src/runtime/javascript/minibar/minibar.js b/src/runtime/javascript/minibar/minibar.js
index 2a0c20931..a93222e8a 100644
--- a/src/runtime/javascript/minibar/minibar.js
+++ b/src/runtime/javascript/minibar/minibar.js
@@ -336,11 +336,11 @@ function target_lang() {
return langpart(to_menu.options[to_menu.selectedIndex].value,grammar.name);
}
-function show_translations(translations) {
+function show_translations(translationResults) {
var trans=element("translations");
var grammar=element("language_menu").grammar;
var to=target_lang();
- var cnt=translations.length;
+ var cnt=translationResults.length;
//trans.translations=translations;
trans.single_translation=[];
trans.innerHTML="";
@@ -348,18 +348,23 @@ function show_translations(translations) {
cnt>1 ? ""+cnt+" translations:":
"One translation:")));
for(p=0;p<cnt;p++) {
- var t=translations[p];
- var lin=t.linearizations;
- var tbody=empty("tbody");
- if(options.show_abstract && t.tree)
- tbody.appendChild(tr([th(text("Abstract: ")),
- tdt(abstree_button(t.tree),text(" "+t.tree))]));
- for(var i=0;i<lin.length;i++)
- if(to=="-1" || lin[i].to==to)
- tbody.appendChild(tr([th(text(langpart(lin[i].to,grammar.name)+": ")),
- tdt(parsetree_button(t.tree,lin[i].to),
- text(lin[i].text))]));
- trans.appendChild(wrap("table",tbody));
+ var tr=translationResults[p];
+ if (tr.translations != null) {
+ for (q = 0; q < tr.translations.length; q++) {
+ var t = tr.translations[q];
+ var lin=t.linearizations;
+ var tbody=empty("tbody");
+ if(options.show_abstract && t.tree)
+ tbody.appendChild(tr([th(text("Abstract: ")),
+ tdt(abstree_button(t.tree),text(" "+t.tree))]));
+ for(var i=0;i<lin.length;i++)
+ if(to=="-1" || lin[i].to==to)
+ tbody.appendChild(tr([th(text(langpart(lin[i].to,grammar.name)+": ")),
+ tdt(parsetree_button(t.tree,lin[i].to),
+ text(lin[i].text))]));
+ trans.appendChild(wrap("table",tbody));
+ }
+ }
}
}
diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index 7b34fdcf8..ab968ecbf 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -28,8 +28,6 @@ import System.IO
logFile :: FilePath
logFile = "pgf-error.log"
---canParse = PGF.canParse -- old
-canParse _ _ = True -- parser is not optional in new PGF format
main :: IO ()
main = do stderrToFile logFile
@@ -116,15 +114,21 @@ pgfMain pgf command =
doTranslate :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> Maybe PGF.Language -> JSValue
doTranslate pgf input mcat mfrom mto =
showJSON
- [toJSObject [("from", showJSON (PGF.showLanguage from)),
- ("tree", showJSON tree),
- ("linearizations",showJSON
- [toJSObject [("to", PGF.showLanguage to),("text",output)]
- | (to,output) <- linearizeAndBind pgf mto tree]
- )
- ]
- | (from,trees) <- parse' pgf input mcat mfrom,
- tree <- trees]
+ [toJSObject (("from", showJSON from) :
+ ("brackets", showJSON bs) :
+ jsonParseOutput po)
+ | (from,po,bs) <- parse' pgf input mcat mfrom]
+ where
+ jsonParseOutput (PGF.ParseOk trees) = [("translations",showJSON
+ [toJSObject [("tree", showJSON tree),
+ ("linearizations",showJSON
+ [toJSObject [("to", showJSON to),
+ ("text",showJSON output)]
+ | (to,output) <- linearizeAndBind pgf mto tree]
+ )]
+ | tree <- trees])]
+ jsonParseOutput (PGF.ParseFailed _) = []
+ jsonParseOutput (PGF.TypeError errs) = [("typeErrors",showJSON [show (PGF.ppTcError err) | (fid,err) <- errs])]
-- used in phrasebook
doTranslateGroup :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> Maybe PGF.Language -> JSValue
@@ -137,8 +141,8 @@ doTranslateGroup pgf input mcat mfrom mto =
(ts,alt) <- output, let lg = length output])
]
|
- (from,trees) <- parse' pgf input mcat mfrom,
- (to,output) <- groupResults [(t, linearize' pgf mto t) | t <- trees]
+ (from,po,bs) <- parse' pgf input mcat mfrom,
+ (to,output) <- groupResults [(t, linearize' pgf mto t) | t <- case po of {PGF.ParseOk ts -> ts; _ -> []}]
]
where
groupResults = Map.toList . foldr more Map.empty . start . collect
@@ -187,9 +191,14 @@ doTranslateGroup pgf input mcat mfrom mto =
doParse :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> JSValue
doParse pgf input mcat mfrom = showJSON $ map toJSObject
- [[("from", PGF.showLanguage from),("tree",PGF.showExpr [] tree)]
- | (from,trees) <- parse' pgf input mcat mfrom,
- tree <- trees ]
+ [("from", showJSON from) :
+ ("brackets", showJSON bs) :
+ jsonParseOutput po
+ | (from,po,bs) <- parse' pgf input mcat mfrom]
+ where
+ jsonParseOutput (PGF.ParseOk trees) = [("trees",showJSON trees)]
+ jsonParseOutput (PGF.ParseFailed _) = []
+ jsonParseOutput (PGF.TypeError errs) = [("typeErrors",showJSON [show (PGF.ppTcError err) | (fid,err) <- errs])]
doComplete :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> Maybe Int -> JSValue
doComplete pgf input mcat mfrom mlimit = showJSON $ map toJSObject $ limit
@@ -210,7 +219,7 @@ doRandom pgf mcat mlimit =
where limit = take (fromMaybe 1 mlimit)
doGrammar :: PGF -> Maybe (Accept Language) -> JSValue
-doGrammar pgf macc = showJSON $ toJSObject
+doGrammar pgf macc = showJSON $ toJSObject
[("name", showJSON (PGF.abstractName pgf)),
("userLanguage", showJSON (selectLanguage pgf macc)),
("categories", showJSON categories),
@@ -218,8 +227,7 @@ doGrammar pgf macc = showJSON $ toJSObject
("languages", showJSON languages)]
where languages = map toJSObject
[[("name", showJSON l),
- ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)),
- ("canParse", showJSON $ canParse pgf l)]
+ ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l))]
| l <- PGF.languages pgf]
categories = [PGF.showCId cat | cat <- PGF.categories pgf]
functions = [PGF.showCId fun | fun <- PGF.functions pgf]
@@ -318,20 +326,24 @@ instance JSON PGF.Expr where
readJSON x = readJSON x >>= maybe (fail "Bad expression.") return . PGF.readExpr
showJSON = showJSON . PGF.showExpr []
+instance JSON PGF.BracketedString where
+ readJSON x = return (PGF.Leaf "")
+ showJSON x = showJSON ""
+
-- * PGF utilities
cat :: PGF -> Maybe PGF.Type -> PGF.Type
cat pgf mcat = fromMaybe (PGF.startCat pgf) mcat
-parse' :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> [(PGF.Language,[PGF.Tree])]
+parse' :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> [(PGF.Language,PGF.ParseOutput,PGF.BracketedString)]
parse' pgf input mcat mfrom =
- [(from,ts) | from <- froms, canParse pgf from, (PGF.ParseOk ts,_) <- [PGF.parse_ pgf from cat input]]
+ [(from,po,bs) | from <- froms, (po,bs) <- [PGF.parse_ pgf from cat input]]
where froms = maybe (PGF.languages pgf) (:[]) mfrom
cat = fromMaybe (PGF.startCat pgf) mcat
complete' :: PGF -> String -> Maybe PGF.Type -> Maybe PGF.Language -> [(PGF.Language,[String])]
complete' pgf input mcat mfrom =
- [(from,order ss) | from <- froms, canParse pgf from, let ss = PGF.complete pgf from cat input, not (null ss)]
+ [(from,order ss) | from <- froms, let ss = PGF.complete pgf from cat input, not (null ss)]
where froms = maybe (PGF.languages pgf) (:[]) mfrom
cat = fromMaybe (PGF.startCat pgf) mcat
order = sortBy (compare `on` map toLower)
diff --git a/src/server/gwt/Fridge-compile b/src/server/gwt/Fridge-compile
index 89a7f5fb9..d8335ae5c 100644
--- a/src/server/gwt/Fridge-compile
+++ b/src/server/gwt/Fridge-compile
@@ -2,6 +2,9 @@
APPDIR=`dirname $0`;
+GWT_DIR="/home/angelov/gwt-linux-1.5.3"
+GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-linux.jar"
+
if [ -z "$GWT_CLASSPATH" ]; then
echo 'ERROR: $GWT_CLASSPATH is not set'
echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:'
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java
index 37270dffe..6a0eb9ba1 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java
@@ -5,18 +5,8 @@ import java.util.List;
import com.allen_sauer.gwt.dnd.client.PickupDragController;
import com.allen_sauer.gwt.dnd.client.drop.DropController;
import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.user.client.History;
-import com.google.gwt.user.client.HistoryListener;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.WindowResizeListener;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.DockPanel;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.*;
+import com.google.gwt.user.client.ui.*;
public class FridgeApp implements EntryPoint {
@@ -57,10 +47,21 @@ public class FridgeApp implements EntryPoint {
new PGF.TranslateCallback() {
public void onResult (PGF.Translations translations) {
outputPanel.removeStyleDependentName("working");
- for (PGF.Translation t : translations.iterable()) {
- for (PGF.Linearization l : t.getLinearizations().iterable()) {
- outputPanel.add(createTranslation(l.getTo(), l.getText()));
- }
+ for (PGF.TranslationResult tr : translations.iterable()) {
+ if (tr.getTranslations() != null)
+ for (PGF.Translation t : tr.getTranslations().iterable()) {
+ for (PGF.Linearization l : t.getLinearizations().iterable()) {
+ outputPanel.add(createTranslation(l.getTo(), l.getText()));
+ }
+ }
+
+ if (tr.getTypeErrors() != null)
+ for (String error : tr.getTypeErrors()) {
+ SimplePanel panel = new SimplePanel();
+ panel.addStyleName("my-typeError");
+ panel.add(new HTML("<pre>"+error+"</pre>"));
+ outputPanel.add(panel);
+ }
}
}
public void onError (Throwable e) {
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java
index 5d742b737..10c405e5f 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java
@@ -55,14 +55,22 @@ public class PGF {
public interface TranslateCallback extends JSONCallback<Translations> { }
- public static class Translations extends IterableJsArray<Translation> {
+ public static class Translations extends IterableJsArray<TranslationResult> {
protected Translations() { }
}
+ public static class TranslationResult extends JavaScriptObject {
+ protected TranslationResult() { }
+
+ public final native String getFrom() /*-{ return this.from; }-*/;
+ public final native String getBracketedString() /*-{ return this.brackets; }-*/;
+ public final native IterableJsArray<Translation> getTranslations() /*-{ return this.translations; }-*/;
+ public final native String[] getTypeErrors() /*-{ return this.typeErrors; }-*/;
+ }
+
public static class Translation extends JavaScriptObject {
protected Translation() { }
- public final native String getFrom() /*-{ return this.from; }-*/;
public final native String getTree() /*-{ return this.tree; }-*/;
public final native Linearizations getLinearizations() /*-{ return this.linearizations; }-*/;
}
@@ -129,7 +137,9 @@ public class PGF {
protected ParseResult() { }
public final native String getFrom() /*-{ return this.from; }-*/;
- public final native String getTree() /*-{ return this.tree; }-*/;
+ public final native String getBracketedString() /*-{ return this.brackets; }-*/;
+ public final native String[] getTrees() /*-{ return this.trees; }-*/;
+ public final native String[] getTypeErrors() /*-{ return this.typeErrors; }-*/;
}
public String graphvizAbstractTree(String pgfURL, String abstractTree) {
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java
index d662f7011..b026cb83b 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java
@@ -45,25 +45,36 @@ public class TranslateApp implements EntryPoint {
public void onResult (PGF.Translations translations) {
outputPanel.clear();
outputPanel.removeStyleDependentName("working");
- for (PGF.Translation t : translations.iterable()) {
- HorizontalPanel hPanel = new HorizontalPanel();
- hPanel.addStyleName("my-translation-frame");
- VerticalPanel linsPanel = new VerticalPanel();
- linsPanel.addStyleName("my-translation-bar");
- hPanel.add(linsPanel);
- HorizontalPanel btnPanel = new HorizontalPanel();
- btnPanel.addStyleName("my-translation-btns");
- btnPanel.setSpacing(4);
- btnPanel.add(createAbsTreeButton(t.getTree()));
- btnPanel.add(createAlignButton(t.getTree()));
- hPanel.add(btnPanel);
- hPanel.setCellHorizontalAlignment(btnPanel,
- HasHorizontalAlignment.ALIGN_RIGHT);
- outputPanel.add(hPanel);
-
- for (PGF.Linearization l : t.getLinearizations().iterable()) {
- linsPanel.add(createTranslation(l.getTo(), t.getTree(), l.getText()));
- }
+ for (PGF.TranslationResult tr : translations.iterable()) {
+ if (tr.getTranslations() != null)
+ for (PGF.Translation t : tr.getTranslations().iterable()) {
+ HorizontalPanel hPanel = new HorizontalPanel();
+ hPanel.addStyleName("my-translation-frame");
+ VerticalPanel linsPanel = new VerticalPanel();
+ linsPanel.addStyleName("my-translation-bar");
+ hPanel.add(linsPanel);
+ HorizontalPanel btnPanel = new HorizontalPanel();
+ btnPanel.addStyleName("my-translation-btns");
+ btnPanel.setSpacing(4);
+ btnPanel.add(createAbsTreeButton(t.getTree()));
+ btnPanel.add(createAlignButton(t.getTree()));
+ hPanel.add(btnPanel);
+ hPanel.setCellHorizontalAlignment(btnPanel,
+ HasHorizontalAlignment.ALIGN_RIGHT);
+ outputPanel.add(hPanel);
+
+ for (PGF.Linearization l : t.getLinearizations().iterable()) {
+ linsPanel.add(createTranslation(l.getTo(), t.getTree(), l.getText()));
+ }
+ }
+
+ if (tr.getTypeErrors() != null)
+ for (String error : tr.getTypeErrors()) {
+ SimplePanel panel = new SimplePanel();
+ panel.addStyleName("my-typeError");
+ panel.add(new HTML("<pre>"+error+"</pre>"));
+ outputPanel.add(panel);
+ }
}
}
public void onError (Throwable e) {
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.css b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.css
index 3911ed20c..5816831ad 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.css
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.css
@@ -71,6 +71,13 @@ body {
margin: 0.2em;
}
+.my-typeError {
+ padding: 6px;
+ font-size: 150%;
+ font-weight: bold;
+ background: #B9BEC0;
+}
+
.my-SettingsPanel {
width: 100%;
padding: 0.5em 0;
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css
index 2a9c80528..49efa8c76 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css
@@ -72,6 +72,13 @@
cursor:pointer;
}
+.my-typeError {
+ padding: 12px;
+ font-size: 150%;
+ font-weight: bold;
+ background: #CDFFDA;
+}
+
.my-translation-btns {
background: #DDDDDD;
cursor:pointer;
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-20 15:16:51 +0000