Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sv2v
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
sv2v
Commits
deed2d9f
Commit
deed2d9f
authored
Aug 11, 2023
by
Zachary Snow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable PatternSynonyms and TupleSections everywhere
parent
ba94920e
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
15 additions
and
41 deletions
+15
-41
src/Convert/Cast.hs
+0
-1
src/Convert/ExprAsgn.hs
+0
-1
src/Convert/ExprUtils.hs
+0
-1
src/Convert/GenvarName.hs
+0
-1
src/Convert/ImplicitNet.hs
+0
-1
src/Convert/Inside.hs
+2
-2
src/Convert/Interface.hs
+0
-1
src/Convert/Jump.hs
+0
-1
src/Convert/MultiplePacked.hs
+0
-1
src/Convert/Package.hs
+0
-1
src/Convert/ParamType.hs
+0
-2
src/Convert/ResolveBindings.hs
+0
-1
src/Convert/Scoper.hs
+0
-1
src/Convert/Simplify.hs
+0
-1
src/Convert/StringParam.hs
+0
-1
src/Convert/Struct.hs
+0
-2
src/Convert/TypeOf.hs
+0
-1
src/Convert/UnbasedUnsized.hs
+0
-1
src/Convert/Wildcard.hs
+5
-5
src/Language/SystemVerilog/AST/Decl.hs
+0
-1
src/Language/SystemVerilog/AST/Description.hs
+0
-1
src/Language/SystemVerilog/AST/Expr.hs
+0
-1
src/Language/SystemVerilog/AST/ModuleItem.hs
+0
-1
src/Language/SystemVerilog/AST/Number.hs
+0
-1
src/Language/SystemVerilog/AST/Type.hs
+0
-1
src/Language/SystemVerilog/Parser.hs
+0
-1
src/Language/SystemVerilog/Parser/Parse.y
+0
-1
src/Language/SystemVerilog/Parser/Preprocess.hs
+6
-6
src/Language/SystemVerilog/Parser/Tokens.hs
+0
-1
sv2v.cabal
+2
-0
No files found.
src/Convert/Cast.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/ExprAsgn.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/ExprUtils.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/GenvarName.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/ImplicitNet.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/Inside.hs
View file @
deed2d9f
...
...
@@ -43,8 +43,8 @@ convertExpr (Inside expr valueRanges) =
BinOp
LogAnd
(
BinOp
Le
lo
expr
)
(
BinOp
Ge
hi
expr
)
toCheck
pat
tern
=
BinOp
WEq
expr
pat
tern
toCheck
pat
=
BinOp
WEq
expr
pat
convertExpr
other
=
other
convertStmt
::
Stmt
->
Stmt
...
...
src/Convert/Interface.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/Jump.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/MultiplePacked.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/Package.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/ParamType.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/ResolveBindings.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/Scoper.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE FlexibleInstances #-}
{- sv2v
...
...
src/Convert/Simplify.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/StringParam.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/Struct.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/TypeOf.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/UnbasedUnsized.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Convert/Wildcard.hs
View file @
deed2d9f
...
...
@@ -76,10 +76,10 @@ convertExpr scopes (BinOp WEq l r) =
BinOp
BitAnd
couldMatch
$
BinOp
BitOr
noExtraXZs
$
Number
(
Based
1
False
Binary
0
1
)
else
if
numberToInteger
pat
tern
/=
Nothing
then
else
if
numberToInteger
pat
/=
Nothing
then
BinOp
Eq
l
r
else
BinOp
Eq
(
BinOp
BitOr
l
mask
)
pat
tern
'
BinOp
Eq
(
BinOp
BitOr
l
mask
)
pat'
where
lxl
=
BinOp
BitXor
l
l
rxr
=
BinOp
BitXor
r
r
...
...
@@ -92,10 +92,10 @@ convertExpr scopes (BinOp WEq l r) =
lxlxrxr
=
BinOp
BitXor
lxl
rxr
-- For wildcard patterns we can find, use masking
maybePattern
=
lookupPattern
scopes
r
Just
pat
tern
=
maybePattern
Based
size
signed
base
vals
knds
=
pat
tern
Just
pat
=
maybePattern
Based
size
signed
base
vals
knds
=
pat
mask
=
Number
$
Based
size
signed
base
knds
0
pat
tern
'
=
Number
$
Based
size
signed
base
(
vals
.|.
knds
)
0
pat'
=
Number
$
Based
size
signed
base
(
vals
.|.
knds
)
0
convertExpr
scopes
(
BinOp
WNe
l
r
)
=
UniOp
LogNot
$
convertExpr
scopes
$
...
...
src/Language/SystemVerilog/AST/Decl.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
- Initial Verilog AST Author: Tom Hawkins <tomahawkins@gmail.com>
...
...
src/Language/SystemVerilog/AST/Description.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
- Initial Verilog AST Author: Tom Hawkins <tomahawkins@gmail.com>
...
...
src/Language/SystemVerilog/AST/Expr.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
- Initial Verilog AST Author: Tom Hawkins <tomahawkins@gmail.com>
...
...
src/Language/SystemVerilog/AST/ModuleItem.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
- Initial Verilog AST Author: Tom Hawkins <tomahawkins@gmail.com>
...
...
src/Language/SystemVerilog/AST/Number.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-
...
...
src/Language/SystemVerilog/AST/Type.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
- Initial Verilog AST Author: Tom Hawkins <tomahawkins@gmail.com>
...
...
src/Language/SystemVerilog/Parser.hs
View file @
deed2d9f
{-# LANGUAGE TupleSections #-}
{- sv2v
- Author: Zachary Snow <zach@zachjs.com>
-}
...
...
src/Language/SystemVerilog/Parser/Parse.y
View file @
deed2d9f
...
...
@@ -13,7 +13,6 @@
-}
{
{-# LANGUAGE BlockArguments #-}
{-# LANGUAGE TupleSections #-}
module
Language.SystemVerilog.Parser.Parse
(
parse
)
where
import
Control.Monad.Except
...
...
src/Language/SystemVerilog/Parser/Preprocess.hs
View file @
deed2d9f
...
...
@@ -961,19 +961,19 @@ pushChars s p = mapM_ (flip pushChar p) s
-- search for a pattern in the input and remove remove characters up to and
-- including the first occurrence of the pattern
removeThrough
::
String
->
PPS
()
removeThrough
pat
tern
=
do
removeThrough
pat
=
do
str
<-
getInput
case
findIndex
(
isPrefixOf
pat
tern
)
(
tails
str
)
of
case
findIndex
(
isPrefixOf
pat
)
(
tails
str
)
of
Nothing
->
if
pat
tern
==
"
\n
"
if
pat
==
"
\n
"
then
setInput
""
else
lexicalError
$
"Reached EOF while looking for: "
++
show
pat
tern
++
show
pat
Just
patternIdx
->
do
let
chars
=
patternIdx
+
length
pat
tern
let
chars
=
patternIdx
+
length
pat
let
(
dropped
,
rest
)
=
splitAt
chars
str
advancePositions
dropped
when
(
pat
tern
==
"
\n
"
)
$
do
when
(
pat
==
"
\n
"
)
$
do
pos
<-
getPosition
pushChar
'
\n
'
p
os
setInput
rest
src/Language/SystemVerilog/Parser/Tokens.hs
View file @
deed2d9f
{-# LANGUAGE PatternSynonyms #-}
{- sv2v
- Author: Tom Hawkins <tomahawkins@gmail.com>
- Modified by: Zachary Snow <zach@zachjs.com>
...
...
sv2v.cabal
View file @
deed2d9f
...
...
@@ -120,6 +120,8 @@ executable sv2v
autogen-modules:
Paths_sv2v
ghc-options:
-XPatternSynonyms
-XTupleSections
-O3
-threaded
-rtsopts
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment