From 3f4d3e69cf8755b31cbc92e779e29cc2ac5dc71b Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 31 Oct 2007 16:41:39 +0000 Subject: [PATCH] oper and lindef in CanonToJS --- examples/math/MathEnz.gf | 2 +- examples/math/MathSwz.gf | 2 +- src/GF/Canon/CanonToJS.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/math/MathEnz.gf b/examples/math/MathEnz.gf index d30e8114b..394e90e36 100644 --- a/examples/math/MathEnz.gf +++ b/examples/math/MathEnz.gf @@ -1,6 +1,6 @@ --# -path=.:prelude -concrete MathEnz of Math = open Prelude in { +concrete MathEnz of Mathw = open Prelude in { flags lexer = textlit ; unlexer = textlit ; diff --git a/examples/math/MathSwz.gf b/examples/math/MathSwz.gf index 39fdd3374..72e81ae06 100644 --- a/examples/math/MathSwz.gf +++ b/examples/math/MathSwz.gf @@ -1,6 +1,6 @@ --# -path=.:prelude -concrete MathSwz of Math = open Prelude in { +concrete MathSwz of Mathw = open Prelude in { flags lexer = textlit ; unlexer = textlit ; diff --git a/src/GF/Canon/CanonToJS.hs b/src/GF/Canon/CanonToJS.hs index 47d900c9d..78f641139 100644 --- a/src/GF/Canon/CanonToJS.hs +++ b/src/GF/Canon/CanonToJS.hs @@ -50,7 +50,7 @@ concrete2js (C.CId a) (C.CId c, cnc) = ++ concatMap (cncdef2js l) ds where l = JS.Ident c - ds = Map.assocs $ D.lins cnc + ds = concatMap Map.assocs [D.lins cnc, D.opers cnc, D.lindefs cnc] cncdef2js :: JS.Ident -> (C.CId,C.Term) -> [JS.Element] cncdef2js l (C.CId f, t) =