GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix broken patch

Browse Source
This commit is contained in:
Krasimir Angelov
2024-08-26 12:15:34 +02:00
parent 428287346a
commit 92cd2df143
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/api/GF/Compile/Compute/Concrete.hs
View File

@@ -367,16 +367,6 @@ patternMatch v0 ((env0,ps,args0,t):eqs) = match env0 ps eqs args0
(PString s1, VEmpty) (PString s1, VEmpty)
| null s1 -> match env ps eqs args | null s1 -> match env ps eqs args
(PSeq min1 max1 p1 min2 max2 p2,v) (PSeq min1 max1 p1 min2 max2 p2,v)
-> case value2string v of
Const s -> do let n = length s
lo = min1 `max` (n-fromMaybe n max2)
hi = (n-min2) `min` fromMaybe n max1
(ds,cs) = splitAt lo s
eqs <- matchStr env (p1:p2:ps) eqs (hi-lo) (reverse ds) cs args
patternMatch v0 eqs
RunTime -> return v0
NonExist-> patternMatch v0 eqs
(PRep minp maxp p, v)
-> case value2string v of -> case value2string v of
Const s -> let n = length s Const s -> let n = length s
lo = min1 `max` (n-fromMaybe n max2) lo = min1 `max` (n-fromMaybe n max2)
@@ -388,7 +378,13 @@ patternMatch v0 ((env0,ps,args0,t):eqs) = match env0 ps eqs args0
else patternMatch v0 eqs else patternMatch v0 eqs
RunTime -> return v0 RunTime -> return v0
NonExist-> patternMatch v0 eqs NonExist-> patternMatch v0 eqs
(PChar, VStr [_]) -> match env ps eqs args (PRep minp maxp p, v)
-> case value2string v of
Const s -> do let n = length s `div` (max minp 1)
eqs <- matchRep env n minp maxp p minp maxp p ps ((env,PString []:ps,(arg:args),t) : eqs) (arg:args)
patternMatch v0 eqs
RunTime -> return v0
NonExist-> patternMatch v0 eqs
(PChars cs, VStr [c]) (PChars cs, VStr [c])
| elem c cs -> match env ps eqs args | elem c cs -> match env ps eqs args
(PInt n, VInt m) (PInt n, VInt m)