Commit Graph
100 Commits
Author SHA1 Message Date
bjorn a6c4747b11 lighttpd.conf: use default server.event-handler = "select" 2008-10-17 12:57:52 +00:00
bjorn 48a031db98 gf-server-jsapi: clean up old callbacks 2008-10-17 12:57:34 +00:00
bjorn feb3e84fb5 Don't include parsers for Ger, Dan, Nor in server/demo.pgf and server/lang.pgf 2008-10-17 12:41:48 +00:00
bjorn 411326de31 Fixed URL in gwt-client/Translate-shell-external to work with lighttpd 2008-10-17 12:41:19 +00:00
bjorn 0eaef4a5b5 Use JSON-P in gf-server-jsapi.js 2008-10-17 11:14:46 +00:00
bjorn 3df821efd7 Added JSON-P support to fastcgi server. 2008-10-17 10:49:34 +00:00
bjorn 1a098d3d7a Delete gf.fcgi in src/server/Makefile. 2008-10-17 10:05:29 +00:00
bjorn 44eeb7a0f7 A bunch of changes that make it easy to run the gf server with lighttpd 2008-10-16 13:39:09 +00:00
bjorn f211fc10ca Multithreaded gf.fcgi. 2008-10-16 13:00:44 +00:00
bjorn 11ba8a6a17 server/makefile added test.pgf target. 2008-10-16 13:00:16 +00:00
bjorn 95278a947f Export list in GF.Compile.GetGrammar 2008-10-16 12:59:40 +00:00
bjorn bb25c86ae5 Copy command-line flags to in-memory module when reading from a .gfo file. This maeans that command-line flags get put in the .pgf file. 2008-10-16 11:58:18 +00:00
bjorn 176dc3e730 In shell "p" command, only try languages that have a parser. 2008-10-16 11:33:09 +00:00
bjorn b0351dc653 build pgf files in src/server with erasing parsing 2008-10-16 11:27:12 +00:00
bjorn f0f4948f5b Allow giving .gfo files as gfc command-line arguments. 2008-10-16 10:33:23 +00:00
bjorn d10c8bd20a Removed on-demand parser generation from the PGF interpreter. 2008-10-16 10:18:54 +00:00
bjorn dc3f283344 Moved parser building in the PGF interpreter to PGF.hs from PGF/Raw/Convert.hs, in preparation for doing something more clever about it (e.g. looking at the parser flag). 2008-10-16 10:13:25 +00:00
bjorn 8726886298 A bit more verbosity when combining PGF files. Use putPointE when writing output files. 2008-10-16 10:12:57 +00:00
bjorn d1633b98d0 Honor --erasing flag from command-line also when compiling existing .gfo to PGF. 2008-10-16 08:27:43 +00:00
bjorn 5422eb54d9 code tweak: use Map.findWithDefault in PGF.Macros.lookMap 2008-10-16 08:22:04 +00:00
bjorn 7676ab8e00 Copy command-line options to module flags when compiling to .gfo. 2008-10-15 14:24:23 +00:00
bjorn 849642e9dd Merge ModuleOptions and Options. 2008-10-15 11:55:18 +00:00
bjorn 1ecb4f63e9 Added OPTIONS class to make options handling somewhat nicer. Next, I will merge Flags and ModuleFlags. 2008-10-15 11:38:34 +00:00
bjorn dc2d0f0df4 Added PGF.TypeCheck to .cabal. 2008-10-15 09:05:37 +00:00
bjorn 88798b2a23 Added option to treat some categories as lexical when generating Haskell data types. 2008-10-10 11:55:12 +00:00
bjorn 5bc73e10bc Merge mine and aarne's variants linearization changes. 2008-10-03 09:53:25 +00:00
bjorn 59cb392bda Don't build FV terms if there is exactly one variant. 2008-10-03 08:18:24 +00:00
bjorn 07b3870699 Fixed variants semantics in PGF linearization to expand make variants of argument lists, to get things like Auto/Wagen gender right. 2008-10-03 07:53:37 +00:00
bjorn 1e8699d159 Added | syntax for variants. 2008-10-03 07:35:26 +00:00
bjorn b7fe4eacc9 Handle concatenations with variants in PGF.ShowLinearize, fixes http://trac.haskell.org/gf/ticket/23 2008-10-03 07:16:39 +00:00
bjorn fa69bd8ab3 Regenerate source GF parser from GF.cf. Now, when GF/Source/Makefile is used, no hand-hacking is needed. 2008-10-02 14:11:41 +00:00
bjorn 9e501521b4 Added src/GF/Source/Makefile for regenerating the GF source parser from GF.cf. 2008-10-02 13:42:24 +00:00
bjorn 86a30ef992 Converted GF/Source/*.hs to Unix line endings, to be able to see what happens when I regenerated the files. 2008-10-02 13:23:54 +00:00
bjorn 8fb068df6a Fail more gracefully on unknown file name extensions. 2008-10-02 12:32:03 +00:00
bjorn 203430ae6d Use parantheses for precedence in pgf-pretty lincats. 2008-09-30 12:02:58 +00:00
bjorn 446aa1b5db Added --cfg option for specifying which CFG transformations to use. Added startcatonly CFG trasnformation. Removed output formats that are now easily done with --cfg: "regular", "nolr". 2008-09-30 11:52:11 +00:00
bjorn 794fbd4a41 Fixed CFG start cats for categories with more than one constituent. 2008-09-30 10:53:36 +00:00
bjorn 3ca6c605b0 Use filtering in regular printer. 2008-09-30 09:39:09 +00:00
bjorn 41c95825f3 SRG conversion: print CFG when a unknown cat is found in renameCats. Do filtering in ebnf printer. 2008-09-30 09:32:16 +00:00
bjorn 8716e48c21 pgf-pretty: remove single field record lincat hack. handle f "" (S []) correctly. 2008-09-30 09:31:31 +00:00
bjorn 664bebf5ce Some pgf-pretty fixes, including note by Peter about W "apa" (S []). 2008-09-30 07:24:01 +00:00
bjorn ba321be3ff Added pgf-pretty output-format 2008-09-26 15:21:32 +00:00
bjorn 0f4e8468be Added isLiteralCat function to PGF.Macros. 2008-09-26 15:04:13 +00:00
bjorn 804232aebc Added 'complete' function to the PGF API. This is a higher-level API to the completion functionality. 2008-09-26 13:17:21 +00:00
bjorn b0dde31f00 Added semantic interpretation tag printing to the *bnf grammar printers. 2008-09-26 12:57:20 +00:00
bjorn 2f3b7d1c55 Use ebnf format for "regular" output-format. 2008-09-26 10:20:18 +00:00
bjorn 7a81b559fe Changed nolr printer to use EBNF format. 2008-09-26 10:03:42 +00:00
bjorn a372357adc ebnf printer: print external cats first. 2008-09-26 09:58:57 +00:00
bjorn 86e94e3b1b bnf and ebnf printer: align ::= symbols. 2008-09-26 09:54:09 +00:00
bjorn a4ded76aa3 SRG category renaming: don't count the external cats when calculating indices. 2008-09-26 09:44:02 +00:00
bjorn d1a2cdb948 Changed SRG category renaming to use GF cat + index among CFG cats for that GF cat, instead of the old Concrete syntax name + index among all CFG cats. 2008-09-26 09:39:48 +00:00
bjorn 65f302bb84 Oops, I accidentally disabled all CFG simplification and LR-removal with the ENBF printing patch. 2008-09-26 09:39:04 +00:00
bjorn 1bcffdce30 Change category naming in CFG generation: the number now starts from 1 for each GF category, instead of being the FCFG category number. 2008-09-26 09:28:03 +00:00
bjorn 92c76a6265 Added --output-format=ebnf. 2008-09-26 09:20:39 +00:00
bjorn 8fa99886b3 In CFG generation: don't add linrow number if the lincat has only a single constituent. 2008-09-26 09:06:52 +00:00
bjorn b114cfda77 Added --output-format=nolr. Minor makeRegular refactoring. 2008-09-25 13:41:07 +00:00
bjorn 13191ac155 Added --output-format=regular. 2008-09-25 11:49:00 +00:00
bjorn 7a5e2a15bd Fixe copy-paste error: srgs_abnf_nonrec produced xml, fixed now. 2008-09-25 11:36:04 +00:00
bjorn cc7173a034 Somewhat nicer FCFG output format. 2008-09-25 08:44:23 +00:00
bjorn cdc647e788 Added an FCFG output format (--output-format=fcfg). This now lives in GF.Speech.PGFToCFG, but should probably move somewhere else. 2008-09-25 08:41:49 +00:00
bjorn 34c5617ef6 Got SRGS ABNF generation to compile. 2008-09-23 12:56:25 +00:00
bjorn 75df5cf443 Added srgs_abnf_nonrec grammar printer to GF.Infra.Options. 2008-09-23 12:44:17 +00:00
bjorn e5779fc594 Re-added old PrSRGS_ABNF (does not compile yet). 2008-09-23 12:41:44 +00:00
bjorn 4862018f14 GWT: somewhat nicer iterable() hack. 2008-09-22 10:11:15 +00:00
bjorn 0031276944 Added iterable() method for nicer iteration through GF method results. (GWT) 2008-09-21 20:37:27 +00:00
bjorn e9f915ba9c Fixed gf-morpho-server.cabal name typo. Added basic README for morpho server. 2008-09-18 20:12:01 +00:00
bjorn 0fdf2ceea2 GWT: disable translation until the language info has been loaded from the server, 2008-09-17 13:25:08 +00:00
bjorn 6fab2a64f4 GWT: update to use new /grammar resource. Select from language based on Accept-Language header. 2008-09-17 13:04:10 +00:00
bjorn c99ce1fd0d fastcgi: rename /info to /grammar 2008-09-17 12:42:05 +00:00
bjorn db6ff30694 fastcgi: replace /categories, /languages and /mylanguage with /info. 2008-09-17 12:37:34 +00:00
bjorn 417ada31f5 fastcgi server: add /mylanguage resource, which selects the language that best matches the Accept-language header. 2008-09-17 12:22:17 +00:00
bjorn 50e600763f GWT: comment out flag icon stuff in CSS. 2008-09-17 11:40:35 +00:00
bjorn b06039634e Towards looking at the locale for default language. Added flag icons. 2008-09-17 10:12:36 +00:00
bjorn 5c2eae8abd Better error handling in GWT UI. 2008-09-16 13:53:07 +00:00
bjorn 117b38e47f GWT client: set Accept header to get plain text error messages, 2008-09-15 15:43:37 +00:00
bjorn c72df9914e Added loading popup to gwt ui 2008-09-15 15:27:33 +00:00
bjorn 6fce3054e3 fastcgi server: decode UTF-8 inputs produced by the gwt client 2008-09-15 15:20:15 +00:00
bjorn b6635b200f gwt installball should not contain gf.fcgi 2008-09-15 14:40:05 +00:00
bjorn ce50458877 GWT: only allow a single compeltion request at a time. 2008-09-15 14:39:25 +00:00
bjorn 6edca9983a Use abs path for gf.fcgi in gwt client. 2008-09-15 14:16:56 +00:00
bjorn eb15d88404 Fixes to the GWT UI to be able to run it on other machines (still some hardcoded paths in the compilation). 2008-09-15 13:49:55 +00:00
bjorn aecf9597eb Added partial word completion to fastcgi server and update GWT UI accordingly. 2008-09-15 13:33:40 +00:00
bjorn 3a7888e660 A somewhat better solution to the words/UTF-8 problem: do encoding last, but only on what appears to be string literals. 2008-09-15 13:16:04 +00:00
bjorn dbb0f3f3e4 Temporary fix for the grave accent a encoding problem: change compatPrint to id.
The problem is that lower case a with a grave accent is coded in UTF-8 as \195\160. 
Unicode character \160 is non-breaking space, so Haskell's words function
will break a UTF-8 encoded string at this character.
String literals in the .gfo file are UTF-8 encoded in generateModuleCode,
just before the call to prGrammar (which uses compactPrint, which used words).
The real solution would be to pretty-print the grammar to Unicode, and then
encode as UTF-8. The problem with that is Latin-1 identifers. They are now
kept in Latin-1 in the .gfo file, since Alex can't handle Unicode.
The real solution to that would be to fix Alex to handle Unicode, but 
that is non-trivial. GHC interally uses a very hacky .x file to be
able to lex UTF-8 source files. 

An alternative solution that doesn't address the weirdness of using two different
encodings in the same .gfo as we do now, is to incorporate compactPrint
into the grammar printer, to avoid having to do any postprocessing.
2008-09-15 12:38:37 +00:00
bjorn becdc147d2 Somewhat nicer gwt client ui style. 2008-09-12 21:07:14 +00:00
bjorn 426b4e8a5b GWT client now has the same func 2008-09-12 11:47:41 +00:00
bjorn e290d744e4 server: changes lang field to name 2008-09-12 11:32:30 +00:00
bjorn 24d82d5a48 Update gf-client.html with new gf.fcgi output types. 2008-09-12 11:14:02 +00:00
bjorn a7bf88fb32 Change JSON structures returned by the translation server to always be arrays of objects. 2008-09-12 11:05:38 +00:00
bjorn 1a320db136 translation server: added limit argument to /complete. 2008-09-12 10:13:16 +00:00
bjorn 45331ffa9c Started working on Google Web Toolkit version of translation server ui. 2008-09-12 10:03:12 +00:00
bjorn 92ffc5072a Fix binary-dist to include gfc and exclude compiled grammars, since the latter didn't work anyway. NOTE: you must re-run autoconf (actually the previous patch is the one that requires this). 2008-09-11 08:35:17 +00:00
bjorn 8a0e9077ce Remove old editor shell script and configure stuff. 2008-09-11 08:30:29 +00:00
bjorn a66913b00a Change version number in configure.ac to 3.0-beta2 too. 2008-09-10 12:48:34 +00:00
bjorn 72b11abe72 Added temporary completions button to AJAX translation UI. 2008-09-10 11:57:00 +00:00
bjorn d6e20ca0bc Note about deleting /tmp/fcgi_ipc 2008-09-10 11:55:10 +00:00
bjorn 7208ead223 missing sudo in erver README 2008-09-10 11:52:45 +00:00
bjorn 5210d1745c mod_fastcgi installation instructions in src/server/README 2008-09-10 08:44:18 +00:00
bjorn 6e6efb14f7 Note that Apache must be restarted after config changes. 2008-09-10 08:19:50 +00:00
bjorn b9066feacc Fix type error in fastcgi server.
I forgot to fix this after I copied the modified FastCGIUtils from morpho-server.
2008-09-10 07:09:44 +00:00