Skip to content

Commit c89b9a5

Browse files
committed
Update Guoxin's figure and move to production
1 parent 17923f2 commit c89b9a5

File tree

8 files changed

+15
-113
lines changed

8 files changed

+15
-113
lines changed

AV/Guoxin/DFACON.css

Lines changed: 0 additions & 21 deletions
This file was deleted.

AV/Guoxin/LRParsing.html

Lines changed: 0 additions & 41 deletions
This file was deleted.

AV/Guoxin/LRParsing.json

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#LRparseDFA2CON {
2+
height: 410px;
3+
}

AV/Guoxin/DFACON.js renamed to AV/VisFormalLang/Parsing/LRparseDFA2CON.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
$(document).ready(function() {
22
"use strict";
33

4-
var av = new JSAV("DFACON", {animationMode: "none"});
4+
var av = new JSAV("LRparseDFA2CON", {animationMode: "none"});
55

66
var l = 40;
77
var xl = 60;
88
var xxl = 80;
99

1010
var width = 1.7*xl;
1111

12-
var l_border = 120;
12+
var l_border = 270;
1313
var t_border = 20;
1414

1515
var v_fill = 30;
@@ -23,17 +23,17 @@ $(document).ready(function() {
2323
av.label("S → _ddX", {left:l_border+15, top:t_border+15});
2424
av.label("0:",{left:l_border-20, top:t_border-10});
2525
av.g.line(l_border + width, t_border + xl/2, l_border + h_fill, t_border + xl/2,
26-
{"arrow-end": "classic-wide-long"});
26+
{"arrow-end": "classic-wide-long"});
2727
av.label("S",{left:l_border+h_fill*0.66, top:t_border-10});
2828
av.g.line(l_border + width/2, t_border + xl, l_border + width/2, t_border + xl + v_fill,
29-
{"arrow-end": "classic-wide-long"});
29+
{"arrow-end": "classic-wide-long"});
3030
av.label("d",{left:l_border+width/2-20, top:t_border+xl-10});
3131

3232
av.g.rect(l_border, t_border + v_fill + xl, width, l);
3333
av.label("S → d_dX", {left:l_border+15, top:t_border+xl+v_fill-5});
3434
av.label("2:",{left:l_border-20, top:t_border+v_fill+xl-10});
3535
av.g.line(l_border + width/2, t_border +v_fill+ xl+l, l_border + width/2, t_border + xl+l +2*v_fill,
36-
{"arrow-end": "classic-wide-long"});
36+
{"arrow-end": "classic-wide-long"});
3737
av.label("d",{left:l_border+width/2-20, top:t_border+xl+l+v_fill-10});
3838

3939
av.g.rect(l_border, t_border+2*v_fill+xl+l, width, xxl);
@@ -43,10 +43,10 @@ $(document).ready(function() {
4343
av.g.rect(l_border+gap, t_border+2*v_fill+xl+l+gap, width -2*gap, xxl-2*gap);
4444
av.label("3:",{left:l_border-20, top:t_border+2*v_fill+xl+l-10});
4545
av.g.line(l_border + width/2, t_border +2*v_fill+xxl+l+xl, l_border + width/2, t_border + 3*v_fill+ xxl+l+xl,
46-
{"arrow-end": "classic-wide-long"});
46+
{"arrow-end": "classic-wide-long"});
4747

4848
av.g.line(l_border + width, t_border+3*v_fill+xxl+ xl/3, l_border + h_fill, t_border +3*v_fill+xxl+ xl/3,
49-
{"arrow-end": "classic-wide-long"});
49+
{"arrow-end": "classic-wide-long"});
5050
av.label("a",{left:l_border+width/2-20, top:t_border+xl+l+2*v_fill+xxl-10});
5151

5252
av.label("X",{left:l_border+h_fill*0.66, top:t_border+3*v_fill+xxl+xl/3-40});
@@ -59,7 +59,7 @@ $(document).ready(function() {
5959
av.label("5:",{left:l_border-20, top:t_border+3*v_fill+xl+l+xxl-10});
6060
av.g.polyline([[l_border+width/3, t_border+xl+l+2*xxl+3*v_fill], [l_border+width/4, t_border+xl+l+2*xxl+3*v_fill+15], [l_border+width/3, t_border+xl+l+2*xxl+3*v_fill+30], [l_border+0.6*width, t_border+xl+l+2*xxl+3*v_fill+30], [l_border+width*0.67, t_border+xl+l+2*xxl+3*v_fill+15], [l_border+width*0.58, t_border+xl+l+2*xxl+3*v_fill]], {"arrow-end": "classic-wide-long"});
6161
av.g.line(l_border + width, t_border+3*v_fill+xxl+xl+l+ xl/3, l_border + h_fill, t_border +3*v_fill+xxl+xl+l+ xl/3,
62-
{"arrow-end": "classic-wide-long"});
62+
{"arrow-end": "classic-wide-long"});
6363
av.label("a",{left:l_border+width/2-10, top:t_border+xl+l+2*xxl+3*v_fill-5});
6464
av.label("X",{left:l_border+h_fill*0.66, top:t_border+3*v_fill+xxl+xl+l+xl/3-40});
6565

RST/en/Guoxin/WarmUp.rst

Lines changed: 0 additions & 27 deletions
This file was deleted.

RST/en/VisFormalLang/LRParsing.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,12 +569,9 @@ we enter it into the table for any lookahead that is in
569569
570570
Construct the DFA:
571571

572-
.. odsafig:: Images/lt13dfa1.png
573-
:width: 350
574-
:align: center
575-
:capalign: justify
576-
:figwidth: 90%
577-
:alt: lt13dfa1
572+
.. inlineav:: LRparseDFA2CON dgm
573+
:links: AV/VisFormalLang/Parsing/LRparseDFA2CON.css
574+
:scripts: AV/VisFormalLang/Parsing/LRparseDFA2CON.js
578575

579576
Construct the LR(1) Parse Table
580577

config/Guoxin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"Intro": {}
4242
},
4343
"Warm Up Figure": {
44-
"Guoxin/WarmUp": {}
44+
"VisFormalLang/LRParsing": {}
4545
}
4646
}
4747
}

0 commit comments

Comments
 (0)