summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--LICENSE2
-rw-r--r--language-ecmascript-analysis.cabal8
-rw-r--r--src/Language/ECMAScript3/Analysis/LabelSet.hs6
4 files changed, 11 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 257bae1..684800c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+=0.9.2=
+Fixed an annotation bug in the label set analysis.
+
=0.9.1=
Fixed documentation for Language.ECMAScript3.Analysis.LabelSet, removed the (now obsolete) test-suite.
diff --git a/LICENSE b/LICENSE
index 7369370..c53d40b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
Copyright (c) 2007--2012, Brown University, 2008-2012 Claudiu Saftoiu,
-2012-2015 Stevens Institute of Technology.
+2012-2016 Stevens Institute of Technology.
All Rights Reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/language-ecmascript-analysis.cabal b/language-ecmascript-analysis.cabal
index 69a6595..5400d46 100644
--- a/language-ecmascript-analysis.cabal
+++ b/language-ecmascript-analysis.cabal
@@ -2,10 +2,10 @@
-- further documentation, see http://haskell.org/cabal/users-guide/
name: language-ecmascript-analysis
-version: 0.9.1
+version: 0.9.2
cabal-version: >= 1.10
copyright: (c) 2007-2012 Brown University, (c) 2008-2010 Claudiu Saftoiu,
- (c) 2012-2015 Stevens Institute of Technology
+ (c) 2012-2016 Stevens Institute of Technology
synopsis: JavaScript static analysis library.
description: JavaScript static analysis library. Includes label set and lexical environment analyses. The package versions follow Semantic Versioning model (semver.org).
license: BSD3
@@ -18,7 +18,7 @@ bug-reports: http://github.com/jswebtools/language-ecmascript-analysis/i
category: Language
build-type: Simple
stability: experimental
-Tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.3
+Tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.3, GHC==7.10.3
Extra-Source-Files: CHANGELOG
@@ -29,7 +29,7 @@ source-repository head
source-repository this
type: git
location: git://github.com/jswebtools/language-ecmascript-analysis.git
- tag: 0.9.1
+ tag: 0.9.2
Library
Build-Depends: base >= 4 && < 5
diff --git a/src/Language/ECMAScript3/Analysis/LabelSet.hs b/src/Language/ECMAScript3/Analysis/LabelSet.hs
index 2686999..4bbd606 100644
--- a/src/Language/ECMAScript3/Analysis/LabelSet.hs
+++ b/src/Language/ECMAScript3/Analysis/LabelSet.hs
@@ -81,14 +81,14 @@ annotateStatement :: Data a =>
annotateStatement r w s = case s of
LabelledStmt ann lab stmt ->
let labelset = Set.insert (id2Label lab) (r ann)
- newstmt = annotateStatement r w $ w labelset <$> stmt
+ newstmt = annotateStatement r w $ withAnnotation (w labelset) stmt
in LabelledStmt ann lab newstmt
SwitchStmt {} ->
let labelset = Set.insert EmptyLabel (r $ getAnnotation s)
- in descend (annotateStatement r w) (w labelset <$> s)
+ in descend (annotateStatement r w) $ withAnnotation (w labelset) s
_ | isIterationStmt s ->
let labelset = Set.insert EmptyLabel (r $ getAnnotation s)
- in descend (annotateStatement r w) (w labelset <$> s)
+ in descend (annotateStatement r w) (withAnnotation (w labelset) s)
_ -> descend (annotateStatement r w) s
id2Label :: Id a -> Label