From 0cae4151e349b60d24f5f4a350bcb79e37a1a2f0 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 8 Dec 2010 10:59:48 +0000 Subject: [PATCH] CompCN in Hindustani and Pnb by Shafqat --- examples/animals/QuestionsI.gf | 6 +- lib/doc/synopsis.html | 156 +++++++++++++-------------- lib/src/api/Constructors.gf | 2 +- lib/src/hindustani/VerbHindustani.gf | 1 + lib/src/punjabi/VerbPnb.gf | 1 + 5 files changed, 84 insertions(+), 82 deletions(-) diff --git a/examples/animals/QuestionsI.gf b/examples/animals/QuestionsI.gf index 8da5aa678..4373103e8 100644 --- a/examples/animals/QuestionsI.gf +++ b/examples/animals/QuestionsI.gf @@ -10,18 +10,18 @@ incomplete concrete QuestionsI of Questions = open Syntax in { lin Who love_V2 man_N = ( -mkUtt ((mkQCl whoSg_IP (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N)))) -- 4.548068040131532e-11 +mkUtt (mkQCl (mkQCl whoSg_IP (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N)))) -- 4.548068040131532e-11 ) ; Whom man_N love_V2 = ( --- WARNING: ambiguous example whom does the man love -mkUtt (mkQCl whoPl_IP (mkClSlash (mkNP the_Art man_N) (mkVPSlash love_V2))) -- 2.8425425250822075e-11 +mkUtt (mkQCl (mkQCl whoPl_IP (mkClSlash (mkNP the_Art man_N) (mkVPSlash love_V2)))) -- 2.8425425250822075e-11 --- mkUtt (mkQCl (mkQCl whoSg_IP (mkClSlash (mkNP the_Art man_N) (mkVPSlash love_V2)))) -- 2.8425425250822075e-11 ) ; Answer woman_N love_V2 man_N = ( --- WARNING: ambiguous example the woman loves men -mkUtt (mkCl (mkNP the_Art woman_N) (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))) -- 3.273034657650043e-14 +mkUtt (mkCl (mkCl (mkNP the_Art woman_N) (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N)))) -- 3.273034657650043e-14 --- mkUtt (mkNP the_Art (mkCN (mkCN (mkCN woman_N) (mkNP a_Art plNum love_N)) (mkNP a_Art plNum man_N))) -- 1.6623594622841657e-20 --- mkUtt (mkNP the_Art (mkCN (mkCN woman_N) (mkNP a_Art plNum (mkCN (mkCN love_N) (mkNP a_Art plNum man_N))))) -- 1.6623594622841657e-20 ) diff --git a/lib/doc/synopsis.html b/lib/doc/synopsis.html index c1cbbecab..397838eed 100644 --- a/lib/doc/synopsis.html +++ b/lib/doc/synopsis.html @@ -166,7 +166,7 @@ of C that takes D as an argument. What the constructors exactly ar and what other arguments they take, is described by separate tables for each category.

- +
@@ -231,7 +231,7 @@ also in the Paradigms modules.

Explanations

-
+
@@ -576,7 +576,7 @@ Lexical category, constructors given in

AP - adjectival phrase

-
Category Explanation
+
@@ -666,7 +666,7 @@ Lexical category, constructors given in

AdA - adjective-modifying adverb

-
Function Type
+
@@ -701,7 +701,7 @@ Lexical category, constructors given in

AdN - numeral-modifying adverb

-
Function Type
+
@@ -731,7 +731,7 @@ Lexical category, constructors given in

AdV - adverb directly attached to verb

-
Function Type
+
@@ -746,7 +746,7 @@ Lexical category, constructors given in

Adv - verb-phrase-modifying adverb

-
Function Type
+
@@ -836,7 +836,7 @@ Lexical category, constructors given in

Ant - anteriority

-
Function Type
+
@@ -856,7 +856,7 @@ Lexical category, constructors given in

CAdv - comparative adverb

-
Function Type
+
@@ -881,7 +881,7 @@ Lexical category, constructors given in

CN - common noun (without determiner)

-
Function Type
+
@@ -986,7 +986,7 @@ Lexical category, constructors given in

Card - cardinal number

-
Function Type
+
@@ -1016,7 +1016,7 @@ Lexical category, constructors given in

Cl - declarative clause, with all tenses

-
Function Type
+
@@ -1171,7 +1171,7 @@ Lexical category, constructors given in

ClSlash

-
Function Type
+
@@ -1211,7 +1211,7 @@ Lexical category, constructors given in

Comp - complement of copula, such as AP

-
Function Type
+
@@ -1236,7 +1236,7 @@ Lexical category, constructors given in

Conj - conjunction

-
Function Type
+
@@ -1271,7 +1271,7 @@ Lexical category, constructors given in

Det - determiner phrase

-
Function Type
+
@@ -1391,7 +1391,7 @@ Lexical category, constructors given in

Dig

-
Function Type
+
@@ -1451,7 +1451,7 @@ Lexical category, constructors given in

Digits - cardinal or ordinal in digits

-
Function Type
+
@@ -1476,7 +1476,7 @@ Lexical category, constructors given in

IAdv - interrogative adverb

-
Function Type
+
@@ -1527,7 +1527,7 @@ Lexical category, constructors given in

IDet - interrogative determiner

-
Function Type
+
@@ -1562,7 +1562,7 @@ Lexical category, constructors given in

IP - interrogative pronoun

-
Function Type
+
@@ -1637,7 +1637,7 @@ Lexical category, constructors given in

IQuant

-
Function Type
+
@@ -1652,7 +1652,7 @@ Lexical category, constructors given in

Imp - imperative

-
Function Type
+
@@ -1677,7 +1677,7 @@ Lexical category, constructors given in

ImpForm

-
Function Type
+
@@ -1708,7 +1708,7 @@ Lexical category, constructors given in

ListAP

-
Function Type
+
@@ -1728,7 +1728,7 @@ Lexical category, constructors given in

ListAdv

-
Function Type
+
@@ -1748,7 +1748,7 @@ Lexical category, constructors given in

ListNP

-
Function Type
+
@@ -1768,7 +1768,7 @@ Lexical category, constructors given in

ListRS

-
Function Type
+
@@ -1788,7 +1788,7 @@ Lexical category, constructors given in

ListS

-
Function Type
+
@@ -1826,7 +1826,7 @@ Lexical category, constructors given in

NP - noun phrase (subject or object)

-
Function Type
+
@@ -2001,7 +2001,7 @@ Lexical category, constructors given in

Num - number determining element

-
Function Type
+
@@ -2051,7 +2051,7 @@ Lexical category, constructors given in

Numeral - cardinal or ordinal in words

-
Function Type
+
@@ -2081,7 +2081,7 @@ Lexical category, constructors given in

Ord - ordinal number (used in Det)

-
Function Type
+
@@ -2111,7 +2111,7 @@ Lexical category, constructors given in

PConj - phrase-beginning conjunction

-
Function Type
+
@@ -2147,7 +2147,7 @@ Lexical category, constructors given in

Phr - phrase in a text

-
Function Type
+
@@ -2182,7 +2182,7 @@ Lexical category, constructors given in

Pol - polarity

-
Function Type
+
@@ -2202,7 +2202,7 @@ Lexical category, constructors given in

Predet - predeterminer (prefixed Quant)

-
Function Type
+
@@ -2232,7 +2232,7 @@ Lexical category, constructors given in

Prep - preposition, or just case

-
Function Type
+
@@ -2347,7 +2347,7 @@ Lexical category, constructors given in

Pron - personal pronoun

-
Function Type
+
@@ -2402,7 +2402,7 @@ Lexical category, constructors given in

Punct

-
Function Type
+
@@ -2427,7 +2427,7 @@ Lexical category, constructors given in

QCl - question clause, with all tenses

-
Function Type
+
@@ -2577,7 +2577,7 @@ Lexical category, constructors given in

QS - question

-
Function Type
+
@@ -2597,7 +2597,7 @@ Lexical category, constructors given in

Quant - quantifier ('nucleus' of Det)

-
Function Type
+
@@ -2637,7 +2637,7 @@ Lexical category, constructors given in

RCl - relative clause, with all tenses

-
Function Type
+
@@ -2667,7 +2667,7 @@ Lexical category, constructors given in

RP - relative pronoun

-
Function Type
+
@@ -2687,7 +2687,7 @@ Lexical category, constructors given in

RS - relative

-
Function Type
+
@@ -2712,7 +2712,7 @@ Lexical category, constructors given in

S - declarative sentence

-
Function Type
+
@@ -2742,7 +2742,7 @@ Lexical category, constructors given in

SC - embedded sentence or question

-
Function Type
+
@@ -2767,7 +2767,7 @@ Lexical category, constructors given in

SSlash

-
Function Type
+
@@ -2782,7 +2782,7 @@ Lexical category, constructors given in

Sub100

-
Function Type
+
@@ -2807,7 +2807,7 @@ Lexical category, constructors given in

Sub1000

-
Function Type
+
@@ -2832,7 +2832,7 @@ Lexical category, constructors given in

Subj - subjunction

-
Function Type
+
@@ -2873,7 +2873,7 @@ Lexical category, constructors given in

Tense - tense

-
Function Type
+
@@ -2903,7 +2903,7 @@ Lexical category, constructors given in

Text - text consisting of several phrases

-
Function Type
+
@@ -2953,7 +2953,7 @@ Lexical category, constructors given in

Unit

-
Function Type
+
@@ -3008,7 +3008,7 @@ Lexical category, constructors given in

Utt - sentence, question, word...

-
Function Type
+
@@ -3104,7 +3104,7 @@ Lexical category, constructors given in

V2 - two-place verb

-
Function Type
+
@@ -3155,7 +3155,7 @@ Lexical category, constructors given in

VP - verb phrase

-
Function Type
+
@@ -3305,7 +3305,7 @@ Lexical category, constructors given in

VPSlash - verb phrase missing complement

-
Function Type
+
@@ -3367,7 +3367,7 @@ Lexical category, constructors given in

VV - verb-phrase-complement verb

-
Function Type
+
@@ -3397,7 +3397,7 @@ Lexical category, constructors given in

Voc - vocative or "please"

-
Function Type
+
@@ -3425,7 +3425,7 @@ Lexical category, constructors given in

source http://www.grammaticalframework.org/lib/resource/src/bulgarian/ParadigmsBul.gf

-
Function Type
+
@@ -4116,7 +4116,7 @@ source http://www.grammaticalfr

source http://www.grammaticalframework.org/lib/resource/src/catalan/ParadigmsCat.gf

-
Function Type
+
@@ -4351,7 +4351,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/danish/ParadigmsDan.gf

-
Function Type
+
@@ -4602,7 +4602,7 @@ source http://www.grammaticalframe

source http://www.grammaticalframework.org/lib/resource/src/dutch/ParadigmsDut.gf

-
Function Type
+
@@ -4885,7 +4885,7 @@ source http://www.grammaticalframew

source http://www.grammaticalframework.org/lib/resource/src/english/ParadigmsEng.gf

-
Function Type
+
@@ -5232,7 +5232,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/finnish/ParadigmsFin.gf

-
Function Type
+
@@ -5511,7 +5511,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/french/ParadigmsFre.gf

-
Function Type
+
@@ -5750,7 +5750,7 @@ source http://www.grammaticalframe

source http://www.grammaticalframework.org/lib/resource/src/german/ParadigmsGer.gf

-
Function Type
+
@@ -6049,7 +6049,7 @@ source http://www.grammaticalframe

source http://www.grammaticalframework.org/lib/resource/src/italian/ParadigmsIta.gf

-
Function Type
+
@@ -6288,7 +6288,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/norwegian/ParadigmsNor.gf

-
Function Type
+
@@ -6539,7 +6539,7 @@ source http://www.grammaticalfr

source http://www.grammaticalframework.org/lib/resource/src/polish/ParadigmsPol.gf

-
Function Type
+
@@ -7146,7 +7146,7 @@ source http://www.grammaticalframe

source http://www.grammaticalframework.org/lib/resource/src/romanian/ParadigmsRon.gf

-
Function Type
+
@@ -7297,7 +7297,7 @@ source http://www.grammaticalfra

source http://www.grammaticalframework.org/lib/resource/src/russian/ParadigmsRus.gf

-
Function Type
+
@@ -7440,7 +7440,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/spanish/ParadigmsSpa.gf

-
Function Type
+
@@ -7679,7 +7679,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/swedish/ParadigmsSwe.gf

-
Function Type
+
@@ -7930,7 +7930,7 @@ source http://www.grammaticalfram

source http://www.grammaticalframework.org/lib/resource/src/urdu/ParadigmsUrd.gf

-
Function Type
+
@@ -8205,6 +8205,6 @@ For each language, an instantiation of the functor:

- + diff --git a/lib/src/api/Constructors.gf b/lib/src/api/Constructors.gf index 63494b2f0..a222f107b 100644 --- a/lib/src/api/Constructors.gf +++ b/lib/src/api/Constructors.gf @@ -1023,7 +1023,7 @@ incomplete resource Constructors = open Grammar in { --% mkAP : Ord -> AP -- oldest = AdjOrd ; --% - mkAP : CAdv -> AP -> NP -> AP -- as old as John + mkAP : CAdv -> AP -> NP -> AP -- as old as John = CAdvAP ; --% } ; --% diff --git a/lib/src/hindustani/VerbHindustani.gf b/lib/src/hindustani/VerbHindustani.gf index 2d50a475e..ab49317ba 100644 --- a/lib/src/hindustani/VerbHindustani.gf +++ b/lib/src/hindustani/VerbHindustani.gf @@ -36,6 +36,7 @@ incomplete concrete VerbHindustani of Verb = CatHindustani ** open CommonHindust CompAP ap ={s = \\a => ap.s ! giveNumber a ! giveGender a ! Dir ! Posit } ; CompNP np = {s = \\_ => np.s ! NPObj} ; CompAdv adv = {s = \\a => adv.s ! giveGender a} ; + CompCN cn = {s = \\a => cn.s ! giveNumber a ! Dir} ; } diff --git a/lib/src/punjabi/VerbPnb.gf b/lib/src/punjabi/VerbPnb.gf index 9041a937b..71fa1626a 100644 --- a/lib/src/punjabi/VerbPnb.gf +++ b/lib/src/punjabi/VerbPnb.gf @@ -40,6 +40,7 @@ concrete VerbPnb of Verb = CatPnb ** open ResPnb in { CompAP ap ={s = \\a => ap.s ! giveNumber a ! giveGender a ! Dir } ; CompNP np = {s = \\_ => np.s ! NPObj} ; CompAdv adv = {s = \\a => adv.s ! (fromAgr a).g } ; + CompCN cn = {s = \\a => cn.s ! giveNumber a ! Dir} ; }
Function Type