diff --git a/doc/gf2-highlights.html b/doc/gf2-highlights.html index 036ca55f3..d011a2875 100644 --- a/doc/gf2-highlights.html +++ b/doc/gf2-highlights.html @@ -10,7 +10,7 @@ Highlights, preliminary version
-13/10/2003 +13/10/2003 - 25/11
@@ -18,6 +18,12 @@ Highlights, preliminary version + +
GF1 grammars can be automatically translated to GF2 (although result not as good -as manual). The results can be saved in GF2 files, but this is not necessary. +as manual, since indentation and comments are destroyed). The results can be +saved in GF2 files, but this is not necessary.
Example grammars and resource libraries are in the process of -be converted. At the same time, their API has grown with -new constructions. -English and German resources are up-to-date. -Finnish and Swedish are also, but their derived libraries -have not been adapted to the use of security-bringing lock fields. - +being converted. There will be a new API with +many new constructions. The new versions lie in grammars/newresource. +English and Swedish resources are up-to-date. +In the old API version, grammars/resource, the other languages +are up-to-date.
A make facility works, finding out which modules have to be recompiled.
There is some room for improvement.
+
+Bug.
+Sometimes the grammar compiler gets confused if there are many
+grammars open simultaneously. Then the advice is to empty
+the environment (using e) and compile grammar one by one.
+When read from gfc versions, there should be no problems
+to have several grammars simultaneously.
The module type grammar (to build multilingual grammars) not yet
implemented.
-
-
@@ -153,6 +165,13 @@ line, e.g.
% gf2 -old -abs=Tutorial tut1.Eng.gf tut1.Fin.gf tut1.Fra.gf
+
+
+GF2 has more reserved words than GF 1.2. When old files are read, a preprocessor
+replaces every identifier that has the shape of a new reserved word
+with a variant where the last letter is replaced by Z, e.g.
+instance is replaced by instancZ. This method is of course
+unsafe and should be replaced by something better.
diff --git a/doc/index.html b/doc/index.html
new file mode 100644
index 000000000..06b52930a
--- /dev/null
+++ b/doc/index.html
@@ -0,0 +1,55 @@
+
+
+
+
+25/11/2003
+
+
+
+Aarne Ranta
+
+
+
+Beta version of GF2 now available:
+
+
+
+Highlights
+
+
+
+Sources
+
+
+
+Example grammars
+
+
+
+Linux binary (with fudgets)
+
+
+
+Sun binary (without fudgets;
+use Java GUI from src/java)
+
+
+
+
+Language specification is now available.
+
+
+
+See GF Homepage for
+more information on GF.
+
+
+
+
+
diff --git a/grammars/database/DatabaseEng.gf b/grammars/database/DatabaseEng.gf
index 971ab96a5..47c4a9261 100644
--- a/grammars/database/DatabaseEng.gf
+++ b/grammars/database/DatabaseEng.gf
@@ -1,4 +1,4 @@
---# -path=.:../resource/nabstract:../resource/nenglish:../prelude
+--# -path=.:../newresource/abstract:../newresource/english:../prelude
concrete DatabaseEng of Database = open Prelude, ResourceEng in {
diff --git a/grammars/database/RestaurantEng.gf b/grammars/database/RestaurantEng.gf
index 9b0b208a3..f214d5404 100644
--- a/grammars/database/RestaurantEng.gf
+++ b/grammars/database/RestaurantEng.gf
@@ -1,4 +1,4 @@
---# -path=.:../resource/nabstract:../resource/nenglish:../prelude
+--# -path=.:../newresource/abstract:../newresource/english:../prelude
concrete RestaurantEng of Restaurant =
DatabaseEng ** open Prelude, ParadigmsEng in {
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs
index e2915c0e4..9346fce00 100644
--- a/src/GF/Compile/Compile.hs
+++ b/src/GF/Compile/Compile.hs
@@ -92,7 +92,7 @@ compileModule opts1 st0 file = do
t <- ioeIO getNowTime
return $ (reverseModules cgr, -- to preserve dependency order
(reverseModules sgr, --- keepResModules opts sgr, --- keep all so far
- [(f,t) | f <- files])) -- pass on the time of creation
+ [])) ---- (f,t) | f <- files])) -- pass on the time of creation
compileEnvShSt :: ShellState -> [ModName] -> CompileEnv
compileEnvShSt st fs = (0,sgr,cgr) where
diff --git a/src/Today.hs b/src/Today.hs
index 2a97c49ec..2b5b00c2e 100644
--- a/src/Today.hs
+++ b/src/Today.hs
@@ -1 +1 @@
-module Today where today = "Tue Nov 25 08:16:52 CET 2003"
+module Today where today = "Tue Nov 25 16:53:53 CET 2003"
Grammatical Framework Version 2 beta
+
+