msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

lincat index in CanonToGFCC decreased by 1

Browse Source
This commit is contained in:
aarne
2007-10-03 16:15:33 +00:00
parent 17962eef1a
commit 70c8cff0f9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GF/Canon/CanonToGFCC.hs
View File

@@ -96,7 +96,7 @@ mkCType t = case t of
TStr -> C.S []
where
getI pt = case pt of
C.C i -> i
C.C i -> i + 1
C.RP i _ -> getI i
mkTerm :: Term -> C.Term
@@ -268,7 +268,7 @@ type2type cgr env@(labels,untyps,typs) ty = case ty of
_ -> ty
where
t2t = type2type cgr env
look ty = TInts $ toInteger $ case Map.lookup ty typs of
look ty = TInts $ (+ (-1)) $ toInteger $ case Map.lookup ty typs of
Just vs -> length $ Map.assocs vs
_ -> trace ("unknown partype " ++ show ty) 1 ---- 66669

4
src/GF/Conversion/SimpleToFCFG.hs
View File

@@ -212,7 +212,7 @@ unifyPType nr path (C max_index) =
let (FCat _ _ _ tcs,_) = args !! nr
case lookup path tcs of
Just index -> return index
Nothing -> do index <- member [0..max_index-1]
Nothing -> do index <- member [0..max_index]
restrictArg nr path index
return index
unifyPType nr path (RP alias _) = unifyPType nr path alias
@@ -306,7 +306,7 @@ genFCatArg ctype env@(FRulesEnv last_id fcatSet rules) m1@(FCat _ cat rcs tcs) =
case List.lookup path tcs of
Just index -> return $! addConstraint path index acc
Nothing -> do writeState True
index <- member [0..max_index-1]
index <- member [0..max_index]
return $! addConstraint path index acc
where
addConstraint path0 index0 (c@(path,index) : cs)