Commit Graph

2917 Commits

Author SHA1 Message Date
hallgren
b410cc75cd Fix a prededence bug in GF grammar pretty printer
The pretty printer produced

	mkDet pre {"a"; "an" / vowel} Sg

which is not accepted by the parser. The parser assigns pre { ... }, to
prededence level 4, and this is now reflected in the pretty printer, so
it prints

	mkDet (pre {"a"; "an" / vowel}) Sg

(This caused a problem in GFSE since it parsers pretty printed grammars...)
2012-11-23 18:44:08 +00:00
john.j.camilleri
dbd5c56049 minibar_online.js: updated to launch Editor using a GrammarManager object 2012-11-23 15:07:51 +00:00
john.j.camilleri
7fe922d5a6 Syntax editor: now uses common GrammarManager object 2012-11-23 15:03:36 +00:00
hallgren
fe9b368b90 syntax editor + minibar: fix bug with repeated switching back and forth
By avoiding "this" in callback functions, the code can be kept cleaner.
2012-11-23 13:15:16 +00:00
john.j.camilleri
3ae7f0df0e Syntax editor: return to editor after having switched to minibar 2012-11-23 08:25:00 +00:00
john.j.camilleri
0dac6fc783 Minibar: call abstract_action with 'this' bound to minibar object 2012-11-23 08:21:00 +00:00
john.j.camilleri
2476383b3a Minibar: add show/hide functions 2012-11-23 08:08:13 +00:00
hallgren
8c9b90cc90 minibar: can now switch back to the minibar after switching to the syntax editor
This is done by including a lin_action when starting the syntax editor from
the minibar.
Also: added some minibar options in the syntax editor for consistency...
2012-11-22 16:42:39 +00:00
hallgren
78a2a90903 PGFService.hs: fix type error caused by change to PGF.graphvizParseTree
Note that some of the graphviz functions have backwards incompatible changes
that might also affect other clients of the PGF run-time library.

Also added graphvizDefaults and export it together with GraphvizOptions from 
the PGF run-time library.
2012-11-22 15:27:16 +00:00
john.j.camilleri
8b813be742 Syntax editor: can now load minibar (in-place) from a linearised tree 2012-11-22 12:45:20 +00:00
peter.ljunglof
595c475c70 better visualization of parse trees 2012-11-22 08:50:37 +00:00
peter.ljunglof
1789272c9a Added C compilation notes for Mac OSX 2012-11-22 08:50:49 +00:00
hallgren
1354888b31 minibar: fix bug introduced in previous update
It could case JavaScript error

	ReferenceError: initial_grammar is not defined
2012-11-21 19:01:52 +00:00
hallgren
bd3b512074 minibar+syntax editor integration, work in progress 2
+ Transfer current astract syntax tree when activating the syntax editor
  from the minibar.
+ Add options to start the minibar with given input. You need to include
  the current grammar url, the current language and the input, like this:

    initial_grammar: "/grammars/Foods.pgf",
    initial: { from: "FoodsEng", input:["that","fish","is","fresh"]}

+ Fix a style sheet clash.
2012-11-21 17:13:21 +00:00
john.j.camilleri
5d5ac79b2b Syntax editor: start with initial AST
Note that the argument has been renamed to initial.abstr
(Where abstr means an abstract syntax tree in string form, NOT an AST object)
2012-11-21 15:24:44 +00:00
hallgren
73a458dc66 minibar+syntax editor integration, work in progress 2012-11-21 15:07:59 +00:00
john.j.camilleri
12ed92eac2 Syntax editor: start with initial grammar, startcat, to: languages 2012-11-21 11:22:35 +00:00
john.j.camilleri
11e431d330 support.js: elem() returns false when as is undefined 2012-11-21 11:13:46 +00:00
hallgren
b62d41b8f6 gfse: remove obsolete files 2012-11-20 15:31:31 +00:00
hallgren
fdab9fab6c GF cloud: move gf-web-api-examples.html out of minibar directory 2012-11-20 15:18:05 +00:00
john.j.camilleri
bee1afd7b8 Syntax editor: update to use common js files 2012-11-20 13:56:56 +00:00
hallgren
f402d1687d GF cloud: move support.js and pgf_online.js
Created the folder js and moved minibar/support.js and minibar/pgf_online.js
there, to emphasize their status as app independent support libraries.

There are probably more files that should be moved here.

The cloud apps have been updated, externally hosted apps that link directly
to our server need to be updated too.
2012-11-20 12:56:48 +00:00
john.j.camilleri
47eae4035c Syntax editor: random generation of trees (and subtrees!) 2012-11-20 09:36:50 +00:00
kr.angelov
f8c302f9ef remove the duplicated definition of PgfProductionIdx in parser.c 2012-11-19 14:16:31 +00:00
hallgren
4ec77e5664 GF web service API examples: update examples of the browse command
Also some style tweaks.
2012-11-17 17:42:30 +00:00
hallgren
57ab3564c0 PGF service: command=browse&format=json returns info on all cats and funs
The browse command used to have a required parameter id=... and it returned
info on the given identifier only. Now, if format=json, the id=... parameter
can be omitted to get info on all identifiers at the same time. The returned
JSON structure in this case is

        {cats:{...},funs:{...}}

where the inner objects contain one field per category and function,
respectively, in the same format as when you request info on one category or
function.
2012-11-17 14:22:30 +00:00
hallgren
34ce2ab81e GF web service API examples: added the "abstrjson" command
It converts an abstract syntax tree (represented as a string) to a JSON
structure.
Also some HTML code cleanup.
2012-11-17 11:55:32 +00:00
john.j.camilleri
03a64e2ec7 Syntax editor: work on importing AST as string (eg for generate random)
But it's still not complete. Need an efficient way of getting the cat info to accompany funs.
2012-11-16 14:35:37 +00:00
kr.angelov
71b7c09ffe bugfix for the building of bottom-up filter in the C runtime 2012-11-16 13:27:15 +00:00
hallgren
cf00c8bd0b new-comp: rewrite f (x|y) into (f x|f y)
With this change, all languages in molto/mgl/mixture except German and Polish
can be compiled.
2012-11-16 13:47:10 +00:00
john.j.camilleri
cb92b80aba Syntax editor: select subset of available languages
Also added a basic readme file with a list of todo's
2012-11-16 09:33:55 +00:00
john.j.camilleri
48dbabcbbe Syntax editor: jump to next hole in tree 2012-11-15 15:38:17 +00:00
john.j.camilleri
3216a5def6 Syntax editor: fix bug in Firefox, Seamonkey 2012-11-15 12:40:14 +00:00
hallgren
586d7488f2 Add flag --document-root for user with gf --server
This can make it easier to test cloud service updates before installing them.
2012-11-14 13:52:45 +00:00
hallgren
0ef7b8a3b5 GF usage message fixes
Change the command name from gfc to gf in the usage message header.
Correct spelling of "overide" to "override" in -gf-lib-path description.
2012-11-14 13:49:10 +00:00
kr.angelov
a3ba1991f4 revised heuristic in the statistical parser 2012-11-14 12:34:22 +00:00
john.j.camilleri
7a69d9d5e5 Add first demo of new syntax editor
As part of the GF cloud stuff, it can be accessed from
http://cloud.grammaticalframework.org/syntax-editor/editor.html
2012-11-13 15:14:49 +00:00
hallgren
b6f392b4e1 Adding a new experimental partial evalutator
GF.Compile.Compute.ConcreteNew + two new modules contain a new
partial evaluator intended to solve some performance problems with the old
partial evalutator in GF.Compile.Compute.ConcreteLazy. It has been around for
a while, but is now complete enough to compile the RGL and the Phrasebook.

The old partial evaluator is still used by default. The new one can be activated
in two ways:

  - by using the command line option -new-comp when invoking GF.
  - by using cabal configure -fnew-comp to make -new-comp the default. In this
    case you can also use the command line option -old-comp to revert to the old
    partial evaluator.

In the GF shell, the cc command uses the old evaluator regardless of -new-comp
for now, but you can use "cc -new ..." to invoke the new evaluator.

With -new-comp, computations happen in GF.Compile.GeneratePMCFG instead of
GF.Compile.Optimize. This is implemented by testing the flag optNewComp in
both modules, to omit calls to the old partial evaluator from GF.Compile.Optimize
and add calls to the new partial evaluator in GF.Compile.GeneratePMCFG.
This also means that -new-comp effectively implies -noexpand.

In GF.Compile.CheckGrammar, there is a check that restricted inheritance is used
correctly. However, when -noexpand is used, this check causes unexpected errors,
so it has been converted to generate warnings, for now.

-new-comp no longer enables the new type checker in
GF.Compile.Typeckeck.ConcreteNew.

The GF version number has been bumped to 3.3.10-darcs
2012-11-13 14:09:15 +00:00
kr.angelov
70c68f0527 bugfix in the statistical parser 2012-11-13 09:48:23 +00:00
kr.angelov
08ee662944 two simple heuristics which speed up the statistical parser more than seven times. 2012-11-12 22:17:40 +00:00
kr.angelov
68170d5b08 a simple refactoring in the statistical parser 2012-11-12 21:48:22 +00:00
kr.angelov
a2771552d6 more counters in the profiler for the statistical parser 2012-11-12 15:36:21 +00:00
kr.angelov
46de62c452 now we store the state instead of the offset for every continuation in the chart for the statistical parser 2012-11-12 14:04:52 +00:00
kr.angelov
9967c3ad04 in the statistical parser: move the outside probability from the parse items to their continuation. this makes the value slot shared between many items 2012-11-12 13:43:43 +00:00
kr.angelov
9d23093492 small refactoring in the C runtime 2012-11-12 13:05:35 +00:00
kr.angelov
a50c7c24b8 use size_t consistently as the type for constituent indices in the C runtime 2012-11-12 12:51:27 +00:00
kr.angelov
1e531e8237 implemented gu_map_count in runtime/c/gu/map.c 2012-11-12 12:42:19 +00:00
hallgren
c2b7288411 Eliminate warnings about deprecated use of catch and try
This is also needed for compatibility with GHC 7.6.
2012-11-08 15:53:46 +00:00
hallgren
ad74dfe527 GF.Grammar.PatternMatch: relax overly restrictive type signatures 2012-11-07 17:23:08 +00:00
hallgren
a912ad813d Some changed/new utility functions
GF.Data.Utilities:  Rename mapFst to apFst, mapSnd to apSnd.
		    Add apBoth, mapFst, mapSnd, mapBoth.
GF.Data.Operations: Remove onSnd (same as apSnd)
2012-11-07 15:31:45 +00:00