mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-26 11:18:55 -06:00
paths in Symbol modules; present in ResRon (not complete)
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolAra of Symbol = CatAra ** open Prelude, ResAra in {
|
concrete SymbolAra of Symbol = CatAra ** open Prelude, ResAra in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolBul of Symbol = CatBul ** open Prelude, ResBul in {
|
concrete SymbolBul of Symbol = CatBul ** open Prelude, ResBul in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:romance:abstract:common
|
--# -path=.:../romance:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolCat of Symbol = CatCat ** SymbolRomance with
|
concrete SymbolCat of Symbol = CatCat ** SymbolRomance with
|
||||||
(ResRomance = ResCat) ;
|
(ResRomance = ResCat) ;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:scandinavian:abstract:common
|
--# -path=.:../scandinavian:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolDan of Symbol = CatDan ** SymbolScand with
|
concrete SymbolDan of Symbol = CatDan ** SymbolScand with
|
||||||
(ResScand = ResDan) ;
|
(ResScand = ResDan) ;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolEng of Symbol = CatEng ** open Prelude, ResEng in {
|
concrete SymbolEng of Symbol = CatEng ** open Prelude, ResEng in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolFin of Symbol = CatFin ** open Prelude, NounFin, ResFin in {
|
concrete SymbolFin of Symbol = CatFin ** open Prelude, NounFin, ResFin in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:romance:abstract:common
|
--# -path=.:../romance:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolFre of Symbol = CatFre ** SymbolRomance with
|
concrete SymbolFre of Symbol = CatFre ** SymbolRomance with
|
||||||
(ResRomance = ResFre) ;
|
(ResRomance = ResFre) ;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in {
|
concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolHin of Symbol = CatHin ** open Prelude, ResHin in {
|
concrete SymbolHin of Symbol = CatHin ** open Prelude, ResHin in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolIna of Symbol = CatIna ** open Prelude, ResIna in {
|
concrete SymbolIna of Symbol = CatIna ** open Prelude, ResIna in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:romance:abstract:common
|
--# -path=.:../romance:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolIta of Symbol = CatIta ** SymbolRomance with
|
concrete SymbolIta of Symbol = CatIta ** SymbolRomance with
|
||||||
(ResRomance = ResIta) ;
|
(ResRomance = ResIta) ;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat in {
|
concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat in {
|
||||||
--
|
--
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:scandinavian:abstract:common
|
--# -path=.:../scandinavian:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolNor of Symbol = CatNor ** SymbolScand with
|
concrete SymbolNor of Symbol = CatNor ** SymbolScand with
|
||||||
(ResScand = ResNor) ;
|
(ResScand = ResNor) ;
|
||||||
|
|||||||
@@ -508,9 +508,9 @@ oper
|
|||||||
RCond => VCondit ;
|
RCond => VCondit ;
|
||||||
RPres => VPres m
|
RPres => VPres m
|
||||||
} ;
|
} ;
|
||||||
cmp = case <t,a,m> of
|
cmp = case <<t,a,m> : RTense * Anteriority * Mood> of {
|
||||||
{<RPast,Simul,Indic> | <RPres, Anter,Indic> => True ;
|
<RPast,Simul,Indic> | <RPres, Anter,Indic> => True ; --# notpresent
|
||||||
<RCond, _, _> => True;
|
<RCond, _, _> => True; --# notpresent
|
||||||
_ => False
|
_ => False
|
||||||
} ;
|
} ;
|
||||||
vp = useVP vpr ;
|
vp = useVP vpr ;
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolRon of Symbol =
|
concrete SymbolRon of Symbol =
|
||||||
CatRon ** open Prelude, ResRon in {
|
CatRon ** open Prelude, ResRon in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:abstract:common
|
--# -path=.:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolRus of Symbol = CatRus ** open Prelude, ResRus in {
|
concrete SymbolRus of Symbol = CatRus ** open Prelude, ResRus in {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:romance:abstract:common
|
--# -path=.:../romance:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolSpa of Symbol = CatSpa ** SymbolRomance with
|
concrete SymbolSpa of Symbol = CatSpa ** SymbolRomance with
|
||||||
(ResRomance = ResSpa) ;
|
(ResRomance = ResSpa) ;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:scandinavian:abstract:common
|
--# -path=.:../scandinavian:../abstract:../common
|
||||||
|
|
||||||
concrete SymbolSwe of Symbol = CatSwe ** SymbolScand with
|
concrete SymbolSwe of Symbol = CatSwe ** SymbolScand with
|
||||||
(ResScand = ResSwe) ;
|
(ResScand = ResSwe) ;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import GF.Data.Operations
|
|||||||
import GF.Grammar.API
|
import GF.Grammar.API
|
||||||
import GF.Grammar.Parser
|
import GF.Grammar.Parser
|
||||||
import GF.Grammar.Grammar (Term)
|
import GF.Grammar.Grammar (Term)
|
||||||
import GF.Grammar.PrGrammar (prTermTabular)
|
--import GF.Grammar.PrGrammar (prTermTabular)
|
||||||
import GF.Infra.Option
|
import GF.Infra.Option
|
||||||
import GF.Infra.UseIO
|
import GF.Infra.UseIO
|
||||||
import GF.Text.UTF8
|
import GF.Text.UTF8
|
||||||
@@ -60,7 +60,8 @@ doEval :: Grammar -> String -> Err JSValue
|
|||||||
doEval sgr t = liftM termToJSValue $ eval sgr t
|
doEval sgr t = liftM termToJSValue $ eval sgr t
|
||||||
|
|
||||||
termToJSValue :: Term -> JSValue
|
termToJSValue :: Term -> JSValue
|
||||||
termToJSValue t = showJSON [toJSObject [("name", name), ("value",value)] | (name,value) <- prTermTabular t]
|
termToJSValue t = error "prTermTabular undefined"
|
||||||
|
---- showJSON [toJSObject [("name", name), ("value",value)] | (name,value) <- prTermTabular t]
|
||||||
|
|
||||||
eval :: Grammar -> String -> Err Term
|
eval :: Grammar -> String -> Err Term
|
||||||
eval sgr t =
|
eval sgr t =
|
||||||
|
|||||||
Reference in New Issue
Block a user