summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2013-01-11 15:14:42 +0000
committerhallgren <hallgren@chalmers.se>2013-01-11 15:14:42 +0000
commita8f281491c7285282b7084e1c0d0da2d73e9a127 (patch)
tree7c7b464c2f0d3c391270b63255d446fcf76b0aad /src
parent28020fdf80f30604f511d0686f5ec929b24dd9d9 (diff)
partial evaluator: fix token glueing bug
"a"+("b"++"c") was simplified to "bb"++"c" instead of "ab"++c.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/GF/Compile/Compute/ConcreteNew.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew.hs b/src/compiler/GF/Compile/Compute/ConcreteNew.hs
index 70860fb62..8010f3b15 100644
--- a/src/compiler/GF/Compile/Compute/ConcreteNew.hs
+++ b/src/compiler/GF/Compile/Compute/ConcreteNew.hs
@@ -235,7 +235,7 @@ glue vv = case vv of
x' <- strsFromValue v1
return $ vfv [foldr1 VC (map VString (str2strings (glueStr v u))) | v <- x', u <- y']
(VC va vb,v2) -> VC va (glue (vb,v2))
- (v1,VC va vb) -> VC (glue (va,va)) vb
+ (v1,VC va vb) -> VC (glue (v1,va)) vb
(VS (VV ty pvs vs) vb,v2) -> VS (VV ty pvs [glue (v,v2)|v<-vs]) vb
(v1,VS (VV ty pvs vs) vb) -> VS (VV ty pvs [glue (v1,v)|v<-vs]) vb
-- (v1,v2) -> ok2 VGlue v1 v2