empty in pre

This commit is contained in:
aarne
2005-05-09 14:44:59 +00:00
parent 20af7b9729
commit a734396a7a
6 changed files with 25 additions and 15 deletions

View File

@@ -11,7 +11,8 @@ oper
oper uru : Str = "u:" + pre {"r_u" ; "tti" / cons ; "tt"/ vowel} ;
laks : Str = "lacca" + T ;
ayira : Str = "a:yira" + T ;
cavira : Str = variants {ayira ; "ca:vira" + T} ;
---- cavira : Str = variants {ayira ; "ca:vira" + T} ; ----BUG in Compute (AR 9/5/2005)
cavira : Str = variants {"a:yira" + T ; "ca:vira" + T} ;
T : Str = pre {[] ; "tt" / vowel ; "tti" / cons} ;
U : Str = pre {"u" ; [] / vowel } ;-- ; "ï" / cons} ;
@@ -49,7 +50,9 @@ lin n9 = {s = table {unit => "ombadu" ; teen => "pattombad"+U ;
oper ss : Str -> LinS100 = \s1 -> {s = table {p => s1 ; lak => bind s1 cavira }} ;
lin pot01 =
{s = table {unit => pre {[] ; "önr_u" / strs {[]}} ;
{s = table {unit => "önr_u" ; ---- pre {[] ; "önr_u" / strs {[]}} ;
---- equivalent by the sem. of pre. AR
thou => cavira ;
thou2 => "or" + ayira ;
hund => "n" + uru ;

View File

@@ -47,7 +47,8 @@ lin n9 = mkN "oymbad
oper ss : Str -> LinS100 = \s1 -> {s = table {p => s1 ; lak => bind s1 ayra }} ;
lin pot01 =
{s = table {unit => pre {[] ; "ondï" / strs {[]}} ;
{s = table {unit => "ondï" ; ---- pre {[] ; "ondï" / strs {[]}} ;
---- equivalent by the sem. of pre. AR
thou => variants {ayra ; "o:r" + ayra} ;
hund => "n" + uri ;
_ => "dummy"} };

View File

@@ -15,8 +15,6 @@ lincat Sub10 = LinDigit ;
lincat Sub100 = {s : Str ; s2 : S100 => Str; size : Size} ;
lincat Sub1000 = {s : Str ; s2 : Str ; size : Size } ;
lincat Sub1000000 = {s : Str} ;
lin num x0 =
{s = "/L" ++ x0.s ++ "L/" } ; -- just makes colons into length bar ontop of char
oper mkNumq : Str -> Str -> Str -> Str -> LinDigit =
\twul -> \yelqtwul -> \sumul -> \i ->
@@ -34,7 +32,11 @@ oper mkNum9 : Str -> Str -> Str -> Str -> LinDigit =
\twul -> \yelqtwul -> \sumul -> \i ->
{s = table {unit => twul ; teen => yelqtwul ; ten => sumul ; tenq => sumul + "q" ; chi => i ; chiten => i ++ "sip"} ; size = nine} ;
-- lin n1 = mkNum variants{"hana" ; "han } ; variants {"yelhana" ; "yelhan" }
lin num x0 =
{s = "/L" ++ x0.s ++ "L/" } ; -- just makes colons into length bar ontop of char
-- lin n1 = mkNum variants{"hana" ; "han"} ; variants {"yelhana" ;"yelhan"}
lin n2 = mkNumq (variants {"twu:l" ; "twu" })
(variants {"yelqtwul" ; "yelqtwu" })
(variants {"sumul" ; "sumu" })