[Cleaned up module and import statements in a lot of places where I was lazy and took shortcuts. jupdike@gmail.com**20080211173119] { hunk ./Function.lhs 5 -> module Function where - - ( Ident, Function, Prim, - > constant, - > csplit, summands, factors, esplit, - > (+++), (***), summ, prod, minus, - > nat, zero, half, mhalf, one, mone, two, mtwo, ten - > ) - > where +> module Function ( Ident, Function (..), Prim (..), +> constant, +> csplit, summands, factors, esplit, +> (+++), (***), summ, prod, minus, +> nat, zero, half, mhalf, one, mone, two, mtwo, ten +> ) +> where hunk ./Function.lhs 19 -> import Prim - - ( Ident(..), Prim(..) ) +> import Prim ( Ident, Prim(..) ) hunk ./Function.lhs 64 -> ssumm [] = zero -> ssumm [f] = f -> ssumm fs = Summ fs +> summ [] = zero +> summ [f] = f +> summ fs = Summ fs hunk ./Function.lhs 72 -> pprod [] = one -> pprod [f] = f -> pprod fs = Prod fs +> prod [] = one +> prod [f] = f +> prod fs = Prod fs hunk ./Integrate.lhs 20 -> --renaming (mergeSort to sort) hunk ./Integrate.lhs 23 -> import Function -- ( Function(..), Prim(..), constant, -> -- factors, prod, -> -- (+++), (***), half, one, mone, two ) -> import Derive -- ( derive ) -> import Simplify -- hiding (prod) -> import Table -- ( Table(..), retrieve ) +> import Function ( Function(..), Prim(..), constant, +> factors, prod, +> (+++), (***), half, one, mone, two ) +> import Derive ( derive ) +> import Simplify ( standard1 ) +> +> import Table ( Table(..), retrieve ) hunk ./Prim.lhs 5 -> module Prim - - ( Ident, Prim(..) - > ) - +> module Prim ( Ident, Prim(..) +> ) hunk ./Simplify.lhs 10 -> (...), summ, prod, (^^^), +> summ, prod, (^^^), hunk ./Simplify.lhs 27 -> -> import Function hunk ./Simplify.lhs 28 - > ( Function(..), Prim(..), constant, - > summands, factors, esplit, - > nat, zero, one, mone ) + > import Function + +> import Function ( Function (..), Prim (..), constant, +> summands, factors, esplit, +> nat, zero, one, mone ) hunk ./Table.lhs 23 -> import Prim -- ( Ident(..), Prim(..) ) -> import Expr -- ( Expr(..) ) -> import Function -- ( Function(..), constant, - - > csplit, summands, factors, summ, prod ) +> import Prim ( Ident, Prim(..) ) +> import Expr ( Expr(..) ) +> import Function ( Function(..), constant, +> csplit, summands, factors, summ, prod ) hunk ./Table.lhs 115 -> | length cs <= 1 = match (ssumm cs) (ssumm cs') &= \env1 -> +> | length cs <= 1 = match (summ cs) (summ cs') &= \env1 -> hunk ./Table.lhs 122 -> | length cs <= 1 = match (pprod cs) (pprod cs') &= \env1 -> +> | length cs <= 1 = match (prod cs) (prod cs') &= \env1 -> }