Skip to content

[WIP] Merge expr and jsast - not for review #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

[WIP] Merge expr and jsast - not for review #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c887f38
Line length
rjwright Jul 21, 2014
f234be8
Replaced pattern matches for Maybes with listToMaybe etc.
rjwright Jul 21, 2014
37e6911
Renamed JSAST to AST.
rjwright Jul 21, 2014
23ea22b
Started work on merging Expression and JSAST into one type (AST).
rjwright Jul 21, 2014
c3ffc7d
More on merging Expression and JSAST.
rjwright Jul 21, 2014
585ed1b
More work on merging JSAST and Expression.
rjwright Jul 22, 2014
5221675
Removed some unneeded code.
rjwright Jul 22, 2014
1d3b6c3
Changed approach to sublisting arrays.
rjwright Jul 24, 2014
97057e1
Got leading elisions working with new array processing code.
rjwright Jul 30, 2014
1afaa41
Working on compacting array processing code
rjwright Jul 30, 2014
b47966e
Further compacting
rjwright Jul 30, 2014
0e950f9
Done cleaning up array processing code
rjwright Jul 30, 2014
97ef1ca
Small changes. Need to fix source spans in processElisions.
rjwright Jul 30, 2014
0810545
Improved source spans for elisions in arrays. Still not perfect though.
rjwright Jul 31, 2014
6ea6956
Removed overly complicated code for source spans with elisions.
rjwright Jul 31, 2014
ec74c70
Further cleanup of processArray.
rjwright Jul 31, 2014
deb23db
moved array processing helper functions to top level.
rjwright Aug 1, 2014
1cd910b
Added maybeToProperList and properListToMaybe.
rjwright Aug 12, 2014
c853da5
More playing with Maybes. Can probably be a lot better now I know
rjwright Aug 12, 2014
c49771b
Added build file
rjwright Oct 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
315 changes: 156 additions & 159 deletions DeclarationGraph.hs
View file
Open in desktop

Large diffs are not rendered by default.

507 changes: 507 additions & 0 deletions LabelAST.hs
View file
Open in desktop

Large diffs are not rendered by default.

500 changes: 0 additions & 500 deletions LabelJSAST.hs
View file
Open in desktop

This file was deleted.

84 changes: 40 additions & 44 deletions Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
-- Module takes a JSAST and gives each vertex a unique integer label. The label counter is simply
-- threaded through the tree. Traversal is depth first. It's all fairly straight-forward.


-- The methods in the pipeline are:
-- ParseJS.parseTree - NEEDS PRETTY PRINT
-- ParseJS.getJSASTWithSource - NEEDS PRETTY PRINT
-- ResolveJSASTSourceFragments.jsastListWSMakeSourceFragments
-- LabelJSAST.label
-- ParseJS.getASTWithSource - NEEDS PRETTY PRINT
-- ResolveASTSourceFragments.astListWSMakeSourceFragments
-- LabelAST.label
-- DeclarationGraph.getDeclarationGraph - NEEDS PRETTY PRINT
-- DeclarationGraph.graphGetAllRules (optional) - TYPES NEED PRETTY PRINT
-- DeclarationGraph.cleanFunctionRules (optional)
Expand All @@ -34,7 +32,7 @@ main


import DeclarationGraph
import LabelJSAST
import LabelAST
import Language.JavaScript.Parser
import ParseJS
import PrettyPrint
Expand All @@ -51,12 +49,12 @@ main = do
pr <- readFile infile
putStrLn ""
-- *****************
putStrLn ""
putStrLn "Print the stripped parse tree"
printParseTreeStripped $ jsnGetNode $ parseTree pr infile
putStrLn ""
putStrLn "Print the raw parse tree"
putStrLn $ show $ parse pr infile
-- putStrLn ""
-- putStrLn "Print the stripped parse tree"
-- printParseTreeStripped $ jsnGetNode $ parseTree pr infile
-- putStrLn ""
-- putStrLn "Print the raw parse tree"
-- putStrLn $ show $ parse pr infile
-- *****************
-- PRETTY PRINTED
-- Prints declared functions and function expressions, and the identifiers
Expand All @@ -69,10 +67,10 @@ main = do
-- **PRETTY PRINTED**
-- Prints the rules, indented base on their scope, with optional source code, and an optional
-- list of the identifiers that are visible at that each scope.
putStrLn ""
putStrLn "Pretty print cleaned function rules with identifiers"
putStr "Top Level:"
printCleanedRulesList ((makeCleanedFunctionRules pr infile):[]) (makeIndent "") False True
-- putStrLn ""
-- putStrLn "Pretty print cleaned function rules with identifiers"
-- putStr "Top Level:"
-- printCleanedRulesList ((makeCleanedFunctionRules pr infile):[]) (makeIndent "") False True

-- PRETTY PRINTED (could be improved with pretty printing for types)
-- Print all the rules, optionally with source code.
Expand All @@ -89,39 +87,39 @@ main = do
-- PRETTY PRINTED
-- Print the cleaned ATS.
-- putStrLn ""
-- putStrLn "Pretty print labelled JSAST without labels or source fragments"
-- mapPrintASTChild (makeLabelledJSAST pr infile) (makeIndent "") False False
-- putStrLn "Pretty print labelled AST without labels or source fragments"
-- mapPrintASTChild (makeLabelledAST pr infile) (makeIndent "") False False
-- PRETTY PRINTED
-- Print the cleaned ATS with labels.
-- putStrLn ""
-- putStrLn "Pretty print labelled JSAST with labels"
-- mapPrintASTChild (makeLabelledJSAST pr infile) (makeIndent "") False True
-- putStrLn "Pretty print labelled AST with labels"
-- mapPrintASTChild (makeLabelledAST pr infile) (makeIndent "") False True
-- PRETTY PRINTED
-- Print the cleaned ATS with source.
-- putStrLn ""
-- putStrLn "Pretty print labelled JSAST with source fragments"
-- mapPrintASTChild (makeLabelledJSAST pr infile) (makeIndent "") True False
-- putStrLn "Pretty print labelled AST with source fragments"
-- mapPrintASTChild (makeLabelledAST pr infile) (makeIndent "") True False
-- **PRETTY PRINTED**
-- Print the cleaned ATS with labels and source.
putStrLn ""
putStrLn "Pretty print labelled JSAST with labels and source fragments"
mapPrintASTChild (makeLabelledJSAST pr infile) (makeIndent "") True True
-- putStrLn ""
-- putStrLn "Pretty print labelled AST with labels and source fragments"
-- printASTChild (makeLabelledAST pr infile) (makeIndent "") True True

-- **PRETTY PRINTED**
-- Pretty print the JSASTWithSourceFragment with source fragments
-- Pretty print the ASTWithSourceFragment with source fragments
putStrLn ""
putStrLn "Pretty print JSASTWithSourceFragment with source fragments"
mapPrintASTWS (makeJSASTWithSourceFragments pr infile) (makeIndent "") True
putStrLn "Pretty print ASTWithSourceFragment with source fragments"
printASTWS (makeASTWithSourceFragments pr infile) (makeIndent "") True
-- **PRETTY PRINTED**
-- Pretty print the JSASTWithSourceFragment without source fragments
-- Pretty print the ASTWithSourceFragment without source fragments
putStrLn ""
putStrLn "Pretty print JSASTWithSourceFragment without source fragments"
mapPrintASTWS (makeJSASTWithSourceFragments pr infile) (makeIndent "") False
putStrLn "Pretty print ASTWithSourceFragment without source fragments"
printASTWS (makeASTWithSourceFragments pr infile) (makeIndent "") False

-- Prints the first JSAST (pre-labels).
-- Prints the first AST (pre-labels).
-- putStrLn ""
-- putStrLn "Print the the original JSAST"
-- mapM_ print (makeJSAST pr infile)
-- putStrLn "Print the the original AST"
-- mapM_ print (makeAST pr infile)

-- Rudimentary. Prints the parse tree using Language.JavaScript's showStripped function. Prints
-- one top-level parse tree node per line.
Expand Down Expand Up @@ -151,20 +149,18 @@ makeAllRules input fileName = graphGetAllRules $ makeDeclarationGraph input file
makeDeclarationGraph :: String -> SourceFileName -> FunctionRules
makeDeclarationGraph input fileName =
getDeclarationGraph
(makeLabelledJSAST input fileName)
(makeLabelledAST input fileName)
(fileName, 1, 1, ((length $ lines input) + 1), 1)


makeLabelledJSAST :: String -> SourceFileName -> [ASTChild]
makeLabelledJSAST input fileName = label $ makeJSASTWithSourceFragments input fileName
makeLabelledAST :: String -> SourceFileName -> ASTChild
makeLabelledAST input fileName = label $ makeASTWithSourceFragments input fileName


-- FIXME: Passing the file name here might mean that we don't need to thread it through the whole
-- AST.
makeJSASTWithSourceFragments :: String -> SourceFileName -> [JSASTWithSourceFragment]
makeJSASTWithSourceFragments input fileName =
jsastListWSMakeSourceFragments (makeJSAST input fileName) (SpanPoint fileName ((length $ lines input) + 1) 1)
makeASTWithSourceFragments :: String -> SourceFileName -> ASTWithSourceFragment
makeASTWithSourceFragments input fileName =
astWSMakeSourceFragment (makeAST input fileName) (SpanPoint fileName ((length $ lines input) + 1) 1)


makeJSAST :: String -> SourceFileName -> ([JSASTWithSourceSpan], SourceFileName)
makeJSAST input fileName = getJSASTWithSource (parseTree input fileName) fileName
makeAST :: String -> SourceFileName -> (ASTWithSourceSpan, SourceFileName)
makeAST input fileName = getASTWithSource (parseTree input fileName) fileName
Loading