Commit Graph
100 Commits
Author SHA1 Message Date
bjorn aed72e7653 Added PGF.Macros.mapConcretes 2008-10-20 14:51:42 +00:00
bjorn e5a595567a Added on-demand parser generation back in. It's pretty unproblematic, and can help with memory use in some cases. 2008-10-20 14:05:39 +00:00
bjorn d6ef31ada2 Added new generated GWT output. 2008-10-20 13:30:01 +00:00
bjorn b5756f322f Removed the flag icons from the GWT client. 2008-10-20 13:23:40 +00:00
bjorn c783c12b15 Update gf-server instructions and configuration. 2008-10-20 12:56:08 +00:00
bjorn e25d03ed32 Drop -beta2 from version in GF.cabal. It confuses cabal-install. 2008-10-20 12:49:18 +00:00
bjorn 82b30838d2 Reorganize PGF export list to get easier to read haddock. 2008-10-20 12:10:42 +00:00
bjorn ae3dac1b56 Update gf-server to compile with changed PGF API. 2008-10-20 12:07:05 +00:00
bjorn 335a8d6977 Added Read and Show instances for CId. Also added readCId :: String -> Maybe CId, and use that for readLanguage. 2008-10-20 11:59:31 +00:00
bjorn 0c442d9ac9 Added Read and Show instances for Type. This required moving some code around. 2008-10-20 11:36:17 +00:00
bjorn 29ca3b692b Replace Category with Type in the PGF API. Added readLanguage and showLanguage. 2008-10-20 11:35:05 +00:00
bjorn 9638567274 Added 'run' target to gf-server Makefile. It compiles the server, and starts lighttpd. 2008-10-20 08:46:32 +00:00
bjorn 43ab23b978 Added compiled GWT code to repo. 2008-10-20 08:45:42 +00:00
bjorn 547f362f83 gf-server: New URL format: /grammar.pgf/command 2008-10-20 08:45:00 +00:00
bjorn 95fca30b5d lighttpd.conf tweak 2008-10-20 08:43:23 +00:00
bjorn dd17e7a2cc fastcgi: better grammar cache implementation: don't deadlock on exceptions 2008-10-20 08:24:01 +00:00
bjorn e7656c9d2e (fastcgi) replace DataRef with a more general Cache type, which can hold several PGF grammars. 2008-10-17 14:12:53 +00:00
bjorn 21ff851493 Added PredNP to demo grammars. 2008-10-17 13:00:17 +00:00
bjorn 333efb4063 lighttpd.conf: use default server.event-handler = "select" 2008-10-17 12:57:52 +00:00
bjorn 7317d41c84 gf-server-jsapi: clean up old callbacks 2008-10-17 12:57:34 +00:00
bjorn 2df86ad3fb 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 647164ed64 Fixed URL in gwt-client/Translate-shell-external to work with lighttpd 2008-10-17 12:41:19 +00:00
bjorn d8568d4f66 Use JSON-P in gf-server-jsapi.js 2008-10-17 11:14:46 +00:00
bjorn 9b920a0b73 Added JSON-P support to fastcgi server. 2008-10-17 10:49:34 +00:00
bjorn c59103a27f Delete gf.fcgi in src/server/Makefile. 2008-10-17 10:05:29 +00:00
bjorn 3ee2a7b072 A bunch of changes that make it easy to run the gf server with lighttpd 2008-10-16 13:39:09 +00:00
bjorn e94cfd8567 Multithreaded gf.fcgi. 2008-10-16 13:00:44 +00:00
bjorn bc87219f8e server/makefile added test.pgf target. 2008-10-16 13:00:16 +00:00
bjorn d67d44993b Export list in GF.Compile.GetGrammar 2008-10-16 12:59:40 +00:00
bjorn b9a9fb2f40 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 ff36a38a48 Fixed German feather_N, it was just copy-paste from English. 2008-10-16 11:40:01 +00:00
bjorn 67fabb0e0d In shell "p" command, only try languages that have a parser. 2008-10-16 11:33:09 +00:00
bjorn 1f724b36bb build pgf files in src/server with erasing parsing 2008-10-16 11:27:12 +00:00
bjorn fb3fdcab3d Allow giving .gfo files as gfc command-line arguments. 2008-10-16 10:33:23 +00:00
bjorn d698a006cc Removed on-demand parser generation from the PGF interpreter. 2008-10-16 10:18:54 +00:00
bjorn 8d832b5b9a 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 e75ccc2542 A bit more verbosity when combining PGF files. Use putPointE when writing output files. 2008-10-16 10:12:57 +00:00
bjorn 21e3858442 Honor --erasing flag from command-line also when compiling existing .gfo to PGF. 2008-10-16 08:27:43 +00:00
bjorn 23a139ec07 code tweak: use Map.findWithDefault in PGF.Macros.lookMap 2008-10-16 08:22:04 +00:00
bjorn f898c7543d Copy command-line options to module flags when compiling to .gfo. 2008-10-15 14:24:23 +00:00
bjorn 58381a95a4 Merge ModuleOptions and Options. 2008-10-15 11:55:18 +00:00
bjorn 50ed99e9b1 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 accff02c8d Added PGF.TypeCheck to .cabal. 2008-10-15 09:05:37 +00:00
bjorn 7a5d3da347 Added option to treat some categories as lexical when generating Haskell data types. 2008-10-10 11:55:12 +00:00
bjorn 338d4132c4 Merge mine and aarne's variants linearization changes. 2008-10-03 09:53:25 +00:00
bjorn 3e3ba03724 Don't build FV terms if there is exactly one variant. 2008-10-03 08:18:24 +00:00
bjorn ae13f4f2c9 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 4b41039a5d Added | syntax for variants. 2008-10-03 07:35:26 +00:00
bjorn 6d4d6bce68 Handle concatenations with variants in PGF.ShowLinearize, fixes http://trac.haskell.org/gf/ticket/23 2008-10-03 07:16:39 +00:00
bjorn f362f6ad01 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 2fc5c7f579 Added src/GF/Source/Makefile for regenerating the GF source parser from GF.cf. 2008-10-02 13:42:24 +00:00
bjorn c21d0d10b8 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 7c30f07f75 Fail more gracefully on unknown file name extensions. 2008-10-02 12:32:03 +00:00
bjorn cec77015ad Use parantheses for precedence in pgf-pretty lincats. 2008-09-30 12:02:58 +00:00
bjorn 14373feb3a 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 ed7d52843b Fixed CFG start cats for categories with more than one constituent. 2008-09-30 10:53:36 +00:00
bjorn 3ad9d12c81 Use filtering in regular printer. 2008-09-30 09:39:09 +00:00
bjorn e1d90c00b9 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 6791378846 pgf-pretty: remove single field record lincat hack. handle f "" (S []) correctly. 2008-09-30 09:31:31 +00:00
bjorn 662663ffa3 Some pgf-pretty fixes, including note by Peter about W "apa" (S []). 2008-09-30 07:24:01 +00:00
bjorn 2884598b7c Added pgf-pretty output-format 2008-09-26 15:21:32 +00:00
bjorn 0e869a3574 Added isLiteralCat function to PGF.Macros. 2008-09-26 15:04:13 +00:00
bjorn f377af2617 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 8fe2a1cc59 Added semantic interpretation tag printing to the *bnf grammar printers. 2008-09-26 12:57:20 +00:00
bjorn b64d25b3be Use ebnf format for "regular" output-format. 2008-09-26 10:20:18 +00:00
bjorn a84849bee2 Changed nolr printer to use EBNF format. 2008-09-26 10:03:42 +00:00
bjorn 9010afef50 ebnf printer: print external cats first. 2008-09-26 09:58:57 +00:00
bjorn d54ba6f112 bnf and ebnf printer: align ::= symbols. 2008-09-26 09:54:09 +00:00
bjorn 93e9d60765 SRG category renaming: don't count the external cats when calculating indices. 2008-09-26 09:44:02 +00:00
bjorn d80c71f688 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 c588e8ca2b Oops, I accidentally disabled all CFG simplification and LR-removal with the ENBF printing patch. 2008-09-26 09:39:04 +00:00
bjorn 8c348f963f 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 824d72bf16 Added --output-format=ebnf. 2008-09-26 09:20:39 +00:00
bjorn 84dec7aaa2 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 367cc0acb9 Added --output-format=nolr. Minor makeRegular refactoring. 2008-09-25 13:41:07 +00:00
bjorn 8001ea8ea0 Added --output-format=regular. 2008-09-25 11:49:00 +00:00
bjorn 4d96eb7e9a Fixe copy-paste error: srgs_abnf_nonrec produced xml, fixed now. 2008-09-25 11:36:04 +00:00
bjorn 716250bcf1 Somewhat nicer FCFG output format. 2008-09-25 08:44:23 +00:00
bjorn 90b2441c34 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 0d1b2c01b9 Got SRGS ABNF generation to compile. 2008-09-23 12:56:25 +00:00
bjorn 66d4909142 Added srgs_abnf_nonrec grammar printer to GF.Infra.Options. 2008-09-23 12:44:17 +00:00
bjorn c01af6168b Re-added old PrSRGS_ABNF (does not compile yet). 2008-09-23 12:41:44 +00:00
bjorn 3d11bf48a3 GWT: somewhat nicer iterable() hack. 2008-09-22 10:11:15 +00:00
bjorn 491a829105 Added iterable() method for nicer iteration through GF method results. (GWT) 2008-09-21 20:37:27 +00:00
bjorn 279ba4823b Fixed gf-morpho-server.cabal name typo. Added basic README for morpho server. 2008-09-18 20:12:01 +00:00
bjorn bc2447bcbb GWT: disable translation until the language info has been loaded from the server, 2008-09-17 13:25:08 +00:00
bjorn 7c79fd0aa9 GWT: update to use new /grammar resource. Select from language based on Accept-Language header. 2008-09-17 13:04:10 +00:00
bjorn 0896d6dee1 fastcgi: rename /info to /grammar 2008-09-17 12:42:05 +00:00
bjorn 4a2bac3cf2 fastcgi: replace /categories, /languages and /mylanguage with /info. 2008-09-17 12:37:34 +00:00
bjorn 9265be0326 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 ee40c265b7 GWT: comment out flag icon stuff in CSS. 2008-09-17 11:40:35 +00:00
bjorn 64bbd08edd Towards looking at the locale for default language. Added flag icons. 2008-09-17 10:12:36 +00:00
bjorn 64728d1205 Better error handling in GWT UI. 2008-09-16 13:53:07 +00:00
bjorn 70f8bc0f99 Convert StructuralCat.gf to ISO-8859-1, it was UTF-8 but without a coding flag (except "algú?"). 2008-09-15 20:03:57 +00:00
bjorn a691f4dfaf GWT client: set Accept header to get plain text error messages, 2008-09-15 15:43:37 +00:00
bjorn 62a872b033 Added loading popup to gwt ui 2008-09-15 15:27:33 +00:00
bjorn a43ed0f99f fastcgi server: decode UTF-8 inputs produced by the gwt client 2008-09-15 15:20:15 +00:00
bjorn 1579174e14 gwt installball should not contain gf.fcgi 2008-09-15 14:40:05 +00:00
bjorn ca9b011b27 GWT: only allow a single compeltion request at a time. 2008-09-15 14:39:25 +00:00
bjorn 59065bb6fc Use abs path for gf.fcgi in gwt client. 2008-09-15 14:16:56 +00:00