mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-24 02:12:50 -06:00
Use the .s field of .c2 fields in ExtraScand instead of plain .c2 to get it to compile.
This commit is contained in:
@@ -10,12 +10,12 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
|
|||||||
|
|
||||||
StrandRelSlash rp slash = {
|
StrandRelSlash rp slash = {
|
||||||
s = \\t,a,p,ag =>
|
s = \\t,a,p,ag =>
|
||||||
rp.s ! ag.gn ! RNom ++ slash.s ! t ! a ! p ! Sub ++ slash.c2 ;
|
rp.s ! ag.gn ! RNom ++ slash.s ! t ! a ! p ! Sub ++ slash.c2.s ;
|
||||||
c = NPAcc
|
c = NPAcc
|
||||||
} ;
|
} ;
|
||||||
EmptyRelSlash rp slash = {
|
EmptyRelSlash rp slash = {
|
||||||
s = \\t,a,p,ag =>
|
s = \\t,a,p,ag =>
|
||||||
slash.s ! t ! a ! p ! Sub ++ slash.c2 ;
|
slash.s ! t ! a ! p ! Sub ++ slash.c2.s ;
|
||||||
c = NPAcc
|
c = NPAcc
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
@@ -25,8 +25,8 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
|
|||||||
cls = slash.s ! t ! a ! p ;
|
cls = slash.s ! t ! a ! p ;
|
||||||
who = ip.s ! accusative
|
who = ip.s ! accusative
|
||||||
in table {
|
in table {
|
||||||
QDir => who ++ cls ! Inv ++ slash.c2 ;
|
QDir => who ++ cls ! Inv ++ slash.c2.s ;
|
||||||
QIndir => who ++ cls ! Sub ++ slash.c2
|
QIndir => who ++ cls ! Sub ++ slash.c2.s
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
@@ -42,6 +42,6 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
|
|||||||
s = \\v,a => infVP vp a ---- no sup
|
s = \\v,a => infVP vp a ---- no sup
|
||||||
} ;
|
} ;
|
||||||
ConjVPI = conjunctDistrTable2 VPIForm Agr ;
|
ConjVPI = conjunctDistrTable2 VPIForm Agr ;
|
||||||
ComplVPIVV vv vpi = insertObj (\\a => vv.c2 ++ vpi.s ! VPIInf ! a) (predV vv) ;
|
ComplVPIVV vv vpi = insertObj (\\a => vv.c2.s ++ vpi.s ! VPIInf ! a) (predV vv) ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user