Commit Graph
100 Commits
Author SHA1 Message Date
bjorn 875e03c92f Use BigLexEng in ParseEng. 2008-10-31 10:58:21 +00:00
bjorn c0a5ababe8 BigLexEng: use mkV3 instead of dirdirV3 2008-10-31 10:54:39 +00:00
bjorn 3836eaf139 BigLexEng: drop superfluous parantheses. 2008-10-31 10:51:33 +00:00
bjorn 2c7edaa0a2 BigLexEng: better use of mkV3, mkV2, mkN2. 2008-10-31 10:47:28 +00:00
bjorn bdc0af1564 ParadigmsEng: more versions of mkV2 and mkV3. 2008-10-31 10:43:13 +00:00
bjorn dbbecda3b3 BigLexEng: Get rid of the last mkV2 with empty second argument. 2008-10-31 10:34:59 +00:00
bjorn b23aa5ea0d igLexEng: Use mkV2 : Str -> V2 instead of mkV2 (mkV "...") 2008-10-31 10:32:47 +00:00
bjorn 6cc801ed1f BigLexEng: Use one-argument mkV2 instead of two-argument one with empty prep. 2008-10-31 10:28:54 +00:00
bjorn 2d39e424c9 Update BigLexEng to use overloaded paradigms. 2008-10-31 10:26:17 +00:00
bjorn 70ddf9cd91 ParadigmsEng: more overloaded version of mkA2, mkV2, mkV3, mkN2. Added mkSubj. 2008-10-31 10:19:44 +00:00
bjorn a18c8d67df LexiconEng: Lexicon.sister_N is N, not N2 (but it probably should be). 2008-10-31 10:05:59 +00:00
bjorn e2f602718a Added BigLexEng from mosg (originally from GF/example) to next-lib/parsing. 2008-10-31 09:26:38 +00:00
bjorn 5a49924c29 Added Pol argument to ExtraEng.Unc* to give them the same signatures as the standard (contracted) versions. This makes it easier to use Unc* as a variant without getting meta-variables when parsing, 2008-10-31 09:22:09 +00:00
bjorn 751d9c8940 Started working on a parsing grammar. English-only so far. 2008-10-30 16:53:26 +00:00
bjorn 4da0100312 Removed "that" variant in RelativeEng.IdRP. Added instead that_RP in ExtraEng[Abs]. 2008-10-30 15:06:34 +00:00
bjorn 3d20090483 More English morphology clean-up. 2008-10-30 14:37:54 +00:00
bjorn 205f4d1516 Remove lots of dead code from MorphoEng. 2008-10-30 14:21:46 +00:00
bjorn 29c63ae172 Added case parameter for stand-alone forms of determiners. I had to move mkPron from ResEng to MorphoEng, and mkQuant from StructuralEng to MorphoEng. I also removed the unused mkPronoun stuff from MorphoEng. 2008-10-30 14:09:27 +00:00
bjorn 61bddaba10 Towards cleaner english morphology: use mkPrep instead of ss in StructuralEng. 2008-10-30 14:08:21 +00:00
bjorn d2a9a9c480 Removed some unused (and strange) code from MorphoEng.
Why would you want a function that always returns the noun "dog"?
2008-10-30 13:10:29 +00:00
bjorn 6ebd80ba97 Include .gf file name in source parsing syntax error message. 2008-10-30 10:49:23 +00:00
bjorn 748b60eaee GWT lib and translator: added support for multiple pgf files. 2008-10-30 09:19:58 +00:00
bjorn 3e40a907ca gf-server: added a way to list the available pgf files 2008-10-29 20:45:18 +00:00
bjorn 681648fb05 Rename MainFastCGI.hs to PGFService.hs. 2008-10-29 19:49:38 +00:00
bjorn 70331e394b GWT translator: fixed copy-paste bug where the from language was sent as both from and to language. 2008-10-29 14:30:20 +00:00
bjorn 64765cd184 Changed UncNegX in ExtraEng to take a Temp rather than Tense and Ant arguments. 2008-10-29 13:27:04 +00:00
bjorn 0b2f87ee1f Remove superfluous RP argument to EmptyRelSlash. 2008-10-29 13:06:03 +00:00
bjorn fa061ce136 Replace PGF.Raw with PGF.Binary in the executable section of GF.cabal 2008-10-29 09:46:46 +00:00
bjorn 2c2a8a51e3 Changed gflib.js to handle linearization of literals. This duplicates some functionality from gfjseditor.js, but is required for the translator to be able to linearize literals. The editor should be fixed to remove the special code for literals, but it is a bit to much for me to understand right now. 2008-10-29 09:33:58 +00:00
bjorn 4dd05f663b JS parser: remove empty tokens after lexing. This fixes a problem where a string with leading space couldn't be parsed. 2008-10-29 08:39:23 +00:00
bjorn d61f6f1085 GWT: better heuristics for when to ask the server for completions. 2008-10-28 12:59:00 +00:00
bjorn 7ef019b006 GWT completion: only return request.getLimit() results to the SuggestBox. Re-request completions from the server if there is only one completion. 2008-10-28 12:37:52 +00:00
bjorn 76931b40fb Changed PGF.complete to include the given input if it can be parsed as a complete tree. 2008-10-28 12:28:46 +00:00
bjorn 12a17a7e81 GWT: Hold on to the previous suggestions, and try filtering them before asking the server. 2008-10-27 21:51:54 +00:00
bjorn 938340aed3 GWT: added IterableJsArray.isEmpty(). 2008-10-27 10:18:21 +00:00
bjorn 93b4d6a398 GWT: hide stale suggestions. 2008-10-24 14:22:19 +00:00
bjorn bc255b3a7f GWT code import tweak. 2008-10-24 14:00:24 +00:00
bjorn a984aaa9cb More GWT refactoring. 2008-10-24 08:45:34 +00:00
bjorn c02d577cde Added Eclipse project stuff for the GWT library. Some refactoring of the GWT code. 2008-10-23 11:51:52 +00:00
bjorn 807a314063 Added PGF.parse method to GWT client. 2008-10-22 19:59:43 +00:00
bjorn c205b867be Some refactoring of the GWT translator. 2008-10-22 19:37:57 +00:00
bjorn 252ae4cb31 Make GWT compilation easier. 2008-10-22 13:29:57 +00:00
bjorn 94b8b451df Remove compiled GWT stuff. 2008-10-22 13:28:33 +00:00
bjorn 161cb67082 gf-server: preliminary Ubuntu instructions 2008-10-22 12:36:13 +00:00
bjorn 622dc8fbaf Recompiled GWT code. I should drop the compiled code from the repo soon, this is getting tedious. 2008-10-22 12:07:04 +00:00
bjorn 22c271ad70 Rename the GWT Translate module to PGF. Rename the GF class to PGF. 2008-10-22 12:05:59 +00:00
bjorn 792752c382 Change GWT compilation scripts to make it easier to change the GWT dir location. 2008-10-22 11:19:12 +00:00
bjorn a28183ef01 New compiled GWT stuff. 2008-10-22 09:37:06 +00:00
bjorn e21f64ab09 Reorganize GWT stuff into a reusable module and one application module. 2008-10-22 09:36:05 +00:00
bjorn 7ae8c798e9 gf-server: move some general stuff to FastCGIUtils 2008-10-20 15:17:57 +00:00
bjorn 5b5b91eb0a Added --parser=ondemand flag. 2008-10-20 14:52:50 +00:00
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