diff --git a/.gitignore b/.gitignore new file mode 100644 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +*.hi +*.o +*.p_o +*.p_o-boot +stamp +.DS_Store +.svn +.*.sw? +Setup +alms +alms_p +alms-6.* +alms-7.* +affine +*.tar.gz +dist +affine-6.* +html +*.hi-boot +*.o-boot +test.alms +*.prof diff --git a/Dockerfile b/Dockerfile new file mode 100644 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM ubuntu:trusty-20180712 + +ENV LANG C.UTF-8 +ENV LC_ALL C.UTF-8 + +RUN apt-get update +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ + ghc cabal-install libreadline-dev +RUN cabal update + +ADD https://github.com/tov/alms/archive/docker.tar.gz / +RUN tar zxf docker.tar.gz +RUN mv alms-docker alms + +WORKDIR /alms +RUN cabal install 'fgl>=5' 'HUnit>=1.2' --global +RUN cabal configure --verbose=3 --flags=readline --global +# RUN cabal install --flags=readline --global + +CMD ["/bin/bash"] diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ $(RM) html -VERSION = 0.6.7 +VERSION = 0.6.8 DISTDIR = alms-$(VERSION) TARBALL = $(DISTDIR).tar.gz diff --git a/README b/README --- a/README +++ b/README @@ -1,7 +1,7 @@ This is a prototype implementation of Alms, an affine language with modules and subtyping. -Please see http://www.ccs.neu.edu/home/tov/pubs/alms/ for more +Please see http://users.eecs.northwestern.edu/~jesse/pubs/alms/ for more information. CONTENTS @@ -14,11 +14,12 @@ GETTING STARTED - Alms requires GHC to build. It is known to work with GHC 7.4.1, and - and likely no longer works with GHC 6. + Alms is no longer actively maintained, and does not build with the + latest GHC. In particular, it is know to work with GHC 7.6.3, and and + likely no longer works with GHC 6. It also does not work with GHC 8. - Provided that a recent ghc is in your path, to build on UNIX it ought - to be be sufficient to type: + Provided that a not-too-recent ghc is in your path, to build on UNIX + it ought to be be sufficient to type: % make diff --git a/alms.cabal b/alms.cabal --- a/alms.cabal +++ b/alms.cabal @@ -1,5 +1,5 @@ Name: alms -Version: 0.6.7 +Version: 0.6.8 Copyright: 2012-2015, Jesse A. Tov Cabal-Version: >= 1.8 License: BSD3 @@ -73,97 +73,97 @@ transformers >= 0.2, tuple >= 0.2 Other-Modules: - Alt.Graph - Alt.NodeMap - Alt.Parsec - Alt.PrettyPrint - Alt.Token - AST.Anti - AST.Decl - AST.Expr - AST.Ident - AST.Kind - AST.Lit - AST.Notable - AST.Patt - AST.SyntaxTable - AST.Type - AST.TypeAnnotation AST - Basis.Array - Basis.Channel.Haskell - Basis.Channel - Basis.Exn - Basis.Future - Basis.IO - Basis.MVar - Basis.Row - Basis.Socket - Basis.Thread - Basis - BasisUtils - Compat - Data.Empty - Data.Lattice - Data.Loc - Data.OptionalClass - Data.Perhaps - Data.UnionFind + Statics.Subsume + Statics.Sealing + Statics.Coercion + Statics.InstGen + Statics.Expr + Statics.Patt + Statics.Decl + Statics.Rename + Statics.Env + Statics.Error + Statics.Constraint + Statics.Type + Statics.Sig + Util.Undo + Util.Trace + Util.Viewable + Util.Bogus + Util.MonadRef + Util.Eq1 Dynamics - Env - Error - Main + Meta.FileString + Meta.QuoteData + Meta.Quasi + Meta.THHelpers + Meta.DeriveNotable Message.AST Message.Parser Message.Quasi Message.Render - Meta.DeriveNotable - Meta.FileString - Meta.Quasi - Meta.QuoteData - Meta.THHelpers + Main + Value Paths - Statics.Coercion - Statics.Constraint - Statics.Decl - Statics.Env - Statics.Error - Statics.Expr - Statics.InstGen - Statics.Patt - Statics.Rename - Statics.Sealing - Statics.Sig - Statics.Subsume - Statics.Type - Statics - Syntax.Construction - Syntax.ImplicitThreading - Syntax.Lexer - Syntax.Parser - Syntax.Ppr - Syntax.PprClass - Syntax.Prec - Syntax.Strings - Type.Analyses - Type.ArrowAnnotations - Type.Internal + Env + Compat + Type.Syntax Type.Ppr Type.Rank - Type.Recursive - Type.Reduce + Type.Analyses Type.Subst - Type.Syntax + Type.Reduce Type.TyVar + Type.ArrowAnnotations + Type.Internal + Type.Recursive + Error + AST.SyntaxTable + AST.TypeAnnotation + AST.Ident + AST.Expr + AST.Patt + AST.Anti + AST.Notable + AST.Decl + AST.Kind + AST.Type + AST.Lit + BasisUtils + Basis Type - Util.Bogus - Util.Eq1 - Util.MonadRef - Util.Trace - Util.Undo - Util.Viewable + Syntax.Lexer + Syntax.Parser + Syntax.Ppr + Syntax.Prec + Syntax.Strings + Syntax.PprClass + Syntax.ImplicitThreading + Syntax.Construction + Data.OptionalClass + Data.Lattice + Data.UnionFind + Data.Loc + Data.Perhaps + Data.Empty + Alt.Parsec + Alt.Token + Alt.NodeMap + Alt.PrettyPrint + Alt.Graph + Statics + Basis.Socket + Basis.Array + Basis.Row + Basis.Future + Basis.MVar + Basis.Channel.Haskell + Basis.Exn + Basis.Thread + Basis.Channel + Basis.IO Util - Value Extensions: BangPatterns CPP diff --git a/src/Alt/Graph.hs b/src/Alt/Graph.hs --- a/src/Alt/Graph.hs +++ b/src/Alt/Graph.hs @@ -55,7 +55,7 @@ Nothing → error "labelNode: node not found" labScc ∷ Graph gr ⇒ gr a b → [[LNode a]] -labScc g = map preorder (rdffWith labNode' (topsort g) g) +labScc g = map preorder (Alt.Graph.rdffWith labNode' (topsort g) g) pathScc ∷ Graph gr ⇒ gr a b → [Either (LNode a) [(LNode a, b)]] pathScc g = map (addCycle . preorder) (erdffWith labNode' (topsort g) g) diff --git a/util b/util --- a/util +++ b/util @@ -2,8 +2,8 @@ # vim: sw=2 name=alms -host=login.ccs.neu.edu -remote=.www/pubs/$name +host=login.eecs.northwestern.edu +remote=public_html/pubs/$name extensions=src/extensions.txt version="`awk '$0 ~ /^VERSION *= / { print $3 }' Makefile`"