Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
stage-L3-2016
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Aliaume Lopez
stage-L3-2016
Commits
1d09a10a
Commit
1d09a10a
authored
Sep 20, 2016
by
Aliaume Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correcting the parentheses problem
parent
8febad9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
lines.txt
lines.txt
+10
-6
parser.ml
parser.ml
+2
-2
No files found.
lines.txt
View file @
1d09a10a
let X = link a:b c:d for (a: | c:) . (:d | :b) in
let N = X . NMOS in
let P = X . PMOS in
let INV = (HIGH | FORK | LOW) . (P | NMOS) . JOIN in
let C = (FORK | FORK) . (INV | 3) . (1 | X | 1) . (PMOS | NMOS) . JOIN
in C
let NAND1 = (2 | LOW) . (1 | NMOS) . NMOS in
let NAND2 = (HIGH | 1 | HIGH | 1) . (NMOS | NMOS) . JOIN in
let NAND =
link a0:a1 b0:b1 c1:c0 for
PAR
(a0: | b0:) . :c0
(:a1 | :b1) . NAND1 . c1:
(:a1 | :b1) . NAND2 . c1:
END in
(HIGH | LOW) . NAND
parser.ml
View file @
1d09a10a
...
...
@@ -253,8 +253,8 @@ and parse_circ_name s i =
(* E *)
and
parse_base
s
i
=
begin
(
parse_char
'
(
'
<*>>
parse_parallel
<<*>
parse_char
'
)
'
)
(
parse_char
'
(
'
<*>>
(
ign_space
<*>>
parse_parallel
)
<<*>
(
ign_space
<*>>
parse_char
'
)
'
)
)
<|>
(
pure
id
<*>
parse_int
)
<|>
...
...
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