Commit Graph

8105 Commits

Author SHA1 Message Date
Krasimir Angelov e862968305 added comment for Windows 2018-05-28 10:14:03 +02:00
Krasimir Angelov 4c5fc9f3a8 some tweaks for Windows 2018-05-28 10:12:27 +02:00
Inari Listenmaa 1e71e18e21 (gftest) Add --show-context + combine -o with -f,-c,-b
Added a few new features:

    -o OldGrammar.pgf: if combined with -f , -c or -b , only test the specified trees+functions.
    --show-context FId: shows contexts for the particular concrete category
    --show-cats interacts with --debug by showing also concrete categories
2018-05-24 23:40:11 +01:00
Inari Listenmaa a2f9d9d8d5 Merge pull request #52 from odanoburu/doc-pre
(refman) update pre syntax
2018-05-24 23:10:17 +01:00
Inari Listenmaa a0849d8a5a (gftest) Add --show-context + combine -o with -f,-c,-b 2018-05-24 22:36:23 +02:00
odanoburu 2ae44902e1 (refman) update pre syntax [ci skip] 2018-05-24 13:50:23 +00:00
Prasanth Kolachina 19c6090e85 Merge pull request #50 from pkolachi/master
function for linearizing variants (bracketedStringAll)
2018-05-24 09:52:48 +02:00
Prasanth Kolachina ef4731e8ba spell error in py.egs.README 2018-05-24 09:47:55 +02:00
Prasanth Kolachina 6faad1b3cf add bracketLinearizeAll for variants 2018-05-24 09:47:27 +02:00
odanoburu d205679dce (Por) merge PRs #45 and #48 and solve conflicts 2018-05-23 19:07:32 -03:00
odanoburu b3c6bfa8d2 Merge branch 'por-extra' into por-merge 2018-05-23 19:03:58 -03:00
odanoburu c8b1cb715e Merge remote-tracking branch 'upstream/master' into por 2018-05-23 11:22:46 -03:00
Inari Listenmaa 10df5a7269 (gftest) Multiple concrete categories for context generation 2018-05-22 11:49:42 +01:00
Inari Listenmaa b635cb3d52 (gftest) Better pruning + add new command line option 2018-05-21 18:41:16 +01:00
Krasimir Angelov 9d39648dfb fixed typo which broke the compilation on Windows 2018-05-21 16:03:30 +02:00
Krasimir Angelov e6ae55641f Merge branch 'master' of https://github.com/GrammaticalFramework/GF 2018-05-21 09:37:33 +02:00
Krasimir Angelov a6779486c5 fix the compilation when the byte order cannot be detected statically 2018-05-21 09:36:39 +02:00
John J. Camilleri 41af91f697 Update info about path to jni.h in Java binding install notes 2018-05-21 09:14:26 +02:00
John J. Camilleri ba4057b214 Missing -I in Java bindings Makefile 2018-05-21 09:10:19 +02:00
Inari Listenmaa 1c7e99cdca Merge pull request #37 from mbrock/master
Fix the Nix build
2018-05-04 17:23:53 +02:00
Mikael Brockman 42bcb50154 Fix the Nix build
We use the Nix "jailbreak" function to ignore the upper bounds
on the CGI package dependency.
2018-05-04 14:08:08 +03:00
John J. Camilleri bb5b21b925 Rename README to README.md 2018-05-03 11:03:56 +02:00
John J. Camilleri 260d5251da Markdownise README and add Travis build icon 2018-05-03 10:49:05 +02:00
John J. Camilleri eabaa54a23 Merge pull request #14 from mbrock/master
Add a Travis configuration for checking that new commits build correctly
2018-05-03 10:41:59 +02:00
Inari Listenmaa fc61f97a7a (PhrasebookEst) Fix nationality adj. for Polish 2018-05-01 10:42:29 +02:00
Inari Listenmaa ece39a8879 Estonian Phrasebook: '<Nationality> restaurant' and 'NN is <Nationality>' use different forms 2018-04-30 16:38:20 +02:00
Inari Listenmaa a0fc1dfddd Merge pull request #34 from odanoburu/refman
remove reference to lexer and unlexer flags from documentation
2018-04-22 09:24:55 +02:00
odanoburu 87ddb34a3d - fix typo
- rm link to Wiki that seems dead
2018-04-21 20:09:48 -03:00
odanoburu 9064c3d7cd rm references of lexer and unlexer flags from reference manual 2018-04-21 20:09:40 -03:00
Inari Listenmaa 295896190d Make documentation about -split-pgf clearer 2018-04-18 20:54:27 +02:00
Thomas Hallgren 6f707461e1 gf.cabal: use -fhide-source-paths
if ghc>=8.2
2018-04-18 19:30:03 +02:00
Thomas Hallgren 820d2d503f Fixes for GHC 8.4.1 compatibility
* In GHC 8.4.1, the operator <> has become a method of the Semigroup class
  and is exported from the Prelude. This is unfortunate, since <> is also
  exported from the standard library module Text.PrettyPrint, so in any
  module that defines a pretty printer, there is likely to be an ambiguity.

  This affects ~18 modules in GF. Solution:

    import Prelude hiding (<>)

  This works also in older versions of GHC, since GHC does't complain if
  you hide something that doesn't exists.

* In GHC 8.4.1, Semigroup has become a superclass of Monoid. This means
  that anywhere you define an instance of the Monoid class you also have to
  define an instance in the Semigroup class.

  This affects Data.Binary.Builder in GF. Solution: conditionally define
  a Semigroup instance if compiling with base>=4.11 (ghc>=8.4.1)
2018-04-18 19:18:10 +02:00
Inari Listenmaa fea68d0a88 Merge pull request #31 from odanoburu/por
update Por
2018-04-16 09:00:00 +02:00
odanoburu 2127e74228 merge and rm conflict 2018-04-14 19:22:50 -03:00
odanoburu 7d89d0b442 Merge remote-tracking branch 'upstream/master' into por 2018-04-14 19:22:01 -03:00
Krasimir Angelov 2036ffe06d bugfix in the Haskell binding 2018-04-12 15:12:36 +02:00
Krasimir Angelov 9a6b3b4a1f Merge branch 'master' of https://github.com/GrammaticalFramework/GF 2018-04-12 14:45:30 +02:00
Krasimir Angelov 2d898e78c0 bugfix in the C parser 2018-04-12 14:45:02 +02:00
Inari Listenmaa 4931acc36d Merge pull request #30 from odanoburu/master
small fixes
2018-04-10 08:37:10 +02:00
odanoburu 2c163bb243 - rm duplicate lines 2018-04-09 12:14:32 -03:00
odanoburu d7154a52f9 - rm trailing spaces 2018-04-09 12:14:02 -03:00
odanoburu 69a1944293 Merge remote-tracking branch 'origin/por' into por 2018-04-09 12:10:33 -03:00
odanoburu 92b15a337e rm duplicate lines 2018-04-09 12:09:45 -03:00
Inari Listenmaa fcdcb23b35 Add more helpful printouts if no grammar provided 2018-04-06 16:55:41 +02:00
Inari Listenmaa b9d0012f6b Add a tool to generate test cases for GF grammars 2018-04-06 16:32:58 +02:00
Inari Listenmaa 99db3945c1 Merge pull request #28 from odanoburu/por
WIP: Portuguese resource grammar
2018-04-03 11:41:28 +02:00
odanoburu b4c64cb81b - add Por to complete languages (although it's not quite there yet)
- update headers
- add Por modules to lib/src/api/
2018-03-29 20:17:39 -03:00
Thomas Hallgren 3d6a5e8864 gfse: show grammar comments in the list of public grammars
gf -server now includes the comment field from the grammar in the
response to /cloud requests with command=ls-t and ext=.json
2018-03-29 18:23:32 +02:00
Thomas Hallgren 750a1349ff gfse: allow public grammars to be deleted in more cases
The editor doesn't show delete buttons on grammars published by other
users, but it was too picky when deciding which grammars you own. Now
it should be possible to delete grammars from the device/browser
you published it from, even if you don't have a private copy of it any more.

On a related note, there seems to be problem with the way unique grammars
names are created and maintained, causing published grammars to be duplicated
in some cases. This needs to be overhauled.
2018-03-29 17:02:22 +02:00
odanoburu a59c0ffeee Merge remote-tracking branch 'upstream/master' into por 2018-03-29 11:49:19 -03:00