diff --git a/.travis.yml b/.travis.yml index e762b944..a36373b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ before_install: # Required for coverage. - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls + # Required for dot parser checks. + - go get github.com/goccmack/gocc go_import_path: gonum.org/v1/gonum diff --git a/.travis/check-generate.sh b/.travis/check-generate.sh index 9a95d019..bdfc7abd 100755 --- a/.travis/check-generate.sh +++ b/.travis/check-generate.sh @@ -2,6 +2,7 @@ go generate gonum.org/v1/gonum/blas/gonum go generate gonum.org/v1/gonum/unit +go generate gonum.org/v1/gonum/graph/formats/dot if [ -n "$(git diff)" ]; then exit 1 fi diff --git a/graph/formats/dot/dot.go b/graph/formats/dot/dot.go index 984515e1..07967c7f 100644 --- a/graph/formats/dot/dot.go +++ b/graph/formats/dot/dot.go @@ -8,6 +8,8 @@ // This file is made available under a Creative Commons CC0 1.0 // Universal Public Domain Dedication. +//go:generate ./makeinternal.bash + // Package dot implements a parser for Graphviz DOT files. package dot // import "gonum.org/v1/gonum/graph/formats/dot" diff --git a/graph/formats/dot/internal/lexer/lexer.go b/graph/formats/dot/internal/lexer/lexer.go index 1b8b1c63..2e907952 100644 --- a/graph/formats/dot/internal/lexer/lexer.go +++ b/graph/formats/dot/internal/lexer/lexer.go @@ -53,9 +53,7 @@ func NewLexerFile(fpath string) (*Lexer, error) { } func (this *Lexer) Scan() (tok *token.Token) { - // fmt.Printf("Lexer.Scan() pos=%d\n", this.pos) - tok = new(token.Token) if this.pos >= len(this.src) { tok.Type = token.EOF @@ -66,16 +64,13 @@ func (this *Lexer) Scan() (tok *token.Token) { tok.Type = token.INVALID state, rune1, size := 0, rune(-1), 0 for state != -1 { - // fmt.Printf("\tpos=%d, line=%d, col=%d, state=%d\n", this.pos, this.line, this.column, state) - if this.pos >= len(this.src) { rune1 = -1 } else { rune1, size = utf8.DecodeRune(this.src[this.pos:]) this.pos += size } - // Production start if rune1 != -1 { state = TransTab[state](rune1) @@ -138,7 +133,6 @@ func (this *Lexer) Scan() (tok *token.Token) { tok.Lit = []byte{} } tok.Pos.Offset, tok.Pos.Line, tok.Pos.Column = start, startLine, startColumn - // fmt.Printf("Token at %s: %s \"%s\"\n", tok.String(), token.TokMap.Id(tok.Type), tok.Lit) return @@ -151,188 +145,371 @@ func (this *Lexer) Reset() { /* Lexer symbols: 0: 'n' + 1: 'o' + 2: 'd' + 3: 'e' + 4: 'N' + 5: 'o' + 6: 'd' + 7: 'e' + 8: 'N' + 9: 'O' + 10: 'D' + 11: 'E' + 12: 'e' + 13: 'd' + 14: 'g' + 15: 'e' + 16: 'E' + 17: 'd' + 18: 'g' + 19: 'e' + 20: 'E' + 21: 'D' + 22: 'G' + 23: 'E' + 24: 'g' + 25: 'r' + 26: 'a' + 27: 'p' + 28: 'h' + 29: 'G' + 30: 'r' + 31: 'a' + 32: 'p' + 33: 'h' + 34: 'G' + 35: 'R' + 36: 'A' + 37: 'P' + 38: 'H' + 39: 'd' + 40: 'i' + 41: 'g' + 42: 'r' + 43: 'a' + 44: 'p' + 45: 'h' + 46: 'D' + 47: 'i' + 48: 'g' + 49: 'r' + 50: 'a' + 51: 'p' + 52: 'h' + 53: 'd' + 54: 'i' + 55: 'G' + 56: 'r' + 57: 'a' + 58: 'p' + 59: 'h' + 60: 'D' + 61: 'i' + 62: 'G' + 63: 'r' + 64: 'a' + 65: 'p' + 66: 'h' + 67: 'D' + 68: 'I' + 69: 'G' + 70: 'R' + 71: 'A' + 72: 'P' + 73: 'H' + 74: 's' + 75: 'u' + 76: 'b' + 77: 'g' + 78: 'r' + 79: 'a' + 80: 'p' + 81: 'h' + 82: 'S' + 83: 'u' + 84: 'b' + 85: 'g' + 86: 'r' + 87: 'a' + 88: 'p' + 89: 'h' + 90: 's' + 91: 'u' + 92: 'b' + 93: 'G' + 94: 'r' + 95: 'a' + 96: 'p' + 97: 'h' + 98: 'S' + 99: 'u' + 100: 'b' + 101: 'G' + 102: 'r' + 103: 'a' + 104: 'p' + 105: 'h' + 106: 'S' + 107: 'U' + 108: 'B' + 109: 'G' + 110: 'R' + 111: 'A' + 112: 'P' + 113: 'H' + 114: 's' + 115: 't' + 116: 'r' + 117: 'i' + 118: 'c' + 119: 't' + 120: 'S' + 121: 't' + 122: 'r' + 123: 'i' + 124: 'c' + 125: 't' + 126: 'S' + 127: 'T' + 128: 'R' + 129: 'I' + 130: 'C' + 131: 'T' + 132: '{' + 133: '}' + 134: ';' + 135: '-' + 136: '-' + 137: '-' + 138: '>' + 139: '[' + 140: ']' + 141: ',' + 142: '=' + 143: ':' + 144: '_' + 145: '-' + 146: '.' + 147: '-' + 148: '.' + 149: '\' + 150: '"' + 151: '\' + 152: '"' + 153: '"' + 154: '=' + 155: '<' + 156: '>' + 157: '<' + 158: '>' + 159: '/' + 160: '/' + 161: '\n' + 162: '#' + 163: '\n' + 164: '/' + 165: '*' + 166: '*' + 167: '*' + 168: '/' + 169: ' ' + 170: '\t' + 171: '\r' + 172: '\n' + 173: \u0001-'!' + 174: '#'-'[' + 175: ']'-\u007f + 176: 'a'-'z' + 177: 'A'-'Z' + 178: '0'-'9' + 179: \u0080-\ufffc + 180: \ufffe-\U0010ffff + 181: \u0001-';' + 182: '?'-\u00ff + 183: . */ diff --git a/graph/formats/dot/internal/lexer/transitiontable.go b/graph/formats/dot/internal/lexer/transitiontable.go index 98c1d051..8f8f8393 100644 --- a/graph/formats/dot/internal/lexer/transitiontable.go +++ b/graph/formats/dot/internal/lexer/transitiontable.go @@ -20,7 +20,6 @@ transitionTable[s](r) returns the next state. type TransitionTable [NumStates]func(rune) int var TransTab = TransitionTable{ - // S0 func(r rune) int { switch { @@ -108,19 +107,15 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S1 func(r rune) int { switch { - } return NoState }, - // S2 func(r rune) int { switch { @@ -138,31 +133,24 @@ var TransTab = TransitionTable{ return 33 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 33 - } return NoState }, - // S3 func(r rune) int { switch { case r == 10: // ['\n','\n'] return 34 - default: return 3 } - }, - // S4 func(r rune) int { switch { - } return NoState }, - // S5 func(r rune) int { switch { @@ -174,21 +162,17 @@ var TransTab = TransitionTable{ return 8 case r == 62: // ['>','>'] return 36 - } return NoState }, - // S6 func(r rune) int { switch { case 48 <= r && r <= 57: // ['0','9'] return 37 - } return NoState }, - // S7 func(r rune) int { switch { @@ -196,11 +180,9 @@ var TransTab = TransitionTable{ return 38 case r == 47: // ['/','/'] return 39 - } return NoState }, - // S8 func(r rune) int { switch { @@ -208,27 +190,21 @@ var TransTab = TransitionTable{ return 40 case 48 <= r && r <= 57: // ['0','9'] return 8 - } return NoState }, - // S9 func(r rune) int { switch { - } return NoState }, - // S10 func(r rune) int { switch { - } return NoState }, - // S11 func(r rune) int { switch { @@ -242,19 +218,15 @@ var TransTab = TransitionTable{ return 43 case 63 <= r && r <= 255: // ['?',\u00ff] return 41 - } return NoState }, - // S12 func(r rune) int { switch { - } return NoState }, - // S13 func(r rune) int { switch { @@ -270,11 +242,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S14 func(r rune) int { switch { @@ -298,11 +268,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S15 func(r rune) int { switch { @@ -326,11 +294,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S16 func(r rune) int { switch { @@ -354,11 +320,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S17 func(r rune) int { switch { @@ -382,11 +346,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S18 func(r rune) int { switch { @@ -414,27 +376,21 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S19 func(r rune) int { switch { - } return NoState }, - // S20 func(r rune) int { switch { - } return NoState }, - // S21 func(r rune) int { switch { @@ -450,11 +406,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S22 func(r rune) int { switch { @@ -474,11 +428,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S23 func(r rune) int { switch { @@ -498,11 +450,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S24 func(r rune) int { switch { @@ -522,11 +472,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S25 func(r rune) int { switch { @@ -546,11 +494,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S26 func(r rune) int { switch { @@ -572,27 +518,21 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S27 func(r rune) int { switch { - } return NoState }, - // S28 func(r rune) int { switch { - } return NoState }, - // S29 func(r rune) int { switch { @@ -608,11 +548,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S30 func(r rune) int { switch { @@ -630,19 +568,15 @@ var TransTab = TransitionTable{ return 33 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 33 - } return NoState }, - // S31 func(r rune) int { switch { - } return NoState }, - // S32 func(r rune) int { switch { @@ -660,11 +594,9 @@ var TransTab = TransitionTable{ return 65 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 65 - } return NoState }, - // S33 func(r rune) int { switch { @@ -682,79 +614,61 @@ var TransTab = TransitionTable{ return 33 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 33 - } return NoState }, - // S34 func(r rune) int { switch { - } return NoState }, - // S35 func(r rune) int { switch { - } return NoState }, - // S36 func(r rune) int { switch { - } return NoState }, - // S37 func(r rune) int { switch { case 48 <= r && r <= 57: // ['0','9'] return 37 - } return NoState }, - // S38 func(r rune) int { switch { case r == 42: // ['*','*'] return 66 - default: return 38 } - }, - // S39 func(r rune) int { switch { case r == 10: // ['\n','\n'] return 34 - default: return 39 } - }, - // S40 func(r rune) int { switch { case 48 <= r && r <= 57: // ['0','9'] return 67 - } return NoState }, - // S41 func(r rune) int { switch { @@ -768,11 +682,9 @@ var TransTab = TransitionTable{ return 43 case 63 <= r && r <= 255: // ['?',\u00ff] return 41 - } return NoState }, - // S42 func(r rune) int { switch { @@ -782,19 +694,15 @@ var TransTab = TransitionTable{ return 68 case 63 <= r && r <= 255: // ['?',\u00ff] return 68 - } return NoState }, - // S43 func(r rune) int { switch { - } return NoState }, - // S44 func(r rune) int { switch { @@ -810,11 +718,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S45 func(r rune) int { switch { @@ -834,11 +740,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S46 func(r rune) int { switch { @@ -862,11 +766,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S47 func(r rune) int { switch { @@ -886,11 +788,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S48 func(r rune) int { switch { @@ -910,11 +810,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S49 func(r rune) int { switch { @@ -932,11 +830,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S50 func(r rune) int { switch { @@ -954,11 +850,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S51 func(r rune) int { switch { @@ -978,11 +872,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S52 func(r rune) int { switch { @@ -1002,11 +894,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S53 func(r rune) int { switch { @@ -1026,11 +916,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S54 func(r rune) int { switch { @@ -1050,11 +938,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S55 func(r rune) int { switch { @@ -1074,11 +960,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S56 func(r rune) int { switch { @@ -1098,11 +982,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S57 func(r rune) int { switch { @@ -1126,11 +1008,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S58 func(r rune) int { switch { @@ -1150,11 +1030,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S59 func(r rune) int { switch { @@ -1172,11 +1050,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S60 func(r rune) int { switch { @@ -1196,11 +1072,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S61 func(r rune) int { switch { @@ -1220,11 +1094,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S62 func(r rune) int { switch { @@ -1244,11 +1116,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S63 func(r rune) int { switch { @@ -1266,11 +1136,9 @@ var TransTab = TransitionTable{ return 33 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 33 - } return NoState }, - // S64 func(r rune) int { switch { @@ -1288,11 +1156,9 @@ var TransTab = TransitionTable{ return 33 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 33 - } return NoState }, - // S65 func(r rune) int { switch { @@ -1310,11 +1176,9 @@ var TransTab = TransitionTable{ return 33 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 33 - } return NoState }, - // S66 func(r rune) int { switch { @@ -1322,23 +1186,18 @@ var TransTab = TransitionTable{ return 66 case r == 47: // ['/','/'] return 89 - default: return 38 } - }, - // S67 func(r rune) int { switch { case 48 <= r && r <= 57: // ['0','9'] return 67 - } return NoState }, - // S68 func(r rune) int { switch { @@ -1350,11 +1209,9 @@ var TransTab = TransitionTable{ return 90 case 63 <= r && r <= 255: // ['?',\u00ff] return 68 - } return NoState }, - // S69 func(r rune) int { switch { @@ -1374,11 +1231,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S70 func(r rune) int { switch { @@ -1398,11 +1253,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S71 func(r rune) int { switch { @@ -1422,11 +1275,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S72 func(r rune) int { switch { @@ -1446,11 +1297,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S73 func(r rune) int { switch { @@ -1470,11 +1319,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S74 func(r rune) int { switch { @@ -1494,11 +1341,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S75 func(r rune) int { switch { @@ -1518,11 +1363,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S76 func(r rune) int { switch { @@ -1542,11 +1385,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S77 func(r rune) int { switch { @@ -1566,11 +1407,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S78 func(r rune) int { switch { @@ -1590,11 +1429,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S79 func(r rune) int { switch { @@ -1614,11 +1451,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S80 func(r rune) int { switch { @@ -1638,11 +1473,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S81 func(r rune) int { switch { @@ -1666,11 +1499,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S82 func(r rune) int { switch { @@ -1690,11 +1521,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S83 func(r rune) int { switch { @@ -1714,11 +1543,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S84 func(r rune) int { switch { @@ -1738,11 +1565,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S85 func(r rune) int { switch { @@ -1762,11 +1587,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S86 func(r rune) int { switch { @@ -1786,11 +1609,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S87 func(r rune) int { switch { @@ -1810,11 +1631,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S88 func(r rune) int { switch { @@ -1838,19 +1657,15 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S89 func(r rune) int { switch { - } return NoState }, - // S90 func(r rune) int { switch { @@ -1864,11 +1679,9 @@ var TransTab = TransitionTable{ return 43 case 63 <= r && r <= 255: // ['?',\u00ff] return 41 - } return NoState }, - // S91 func(r rune) int { switch { @@ -1886,11 +1699,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S92 func(r rune) int { switch { @@ -1908,11 +1719,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S93 func(r rune) int { switch { @@ -1930,11 +1739,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S94 func(r rune) int { switch { @@ -1950,11 +1757,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S95 func(r rune) int { switch { @@ -1974,11 +1779,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S96 func(r rune) int { switch { @@ -1998,11 +1801,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S97 func(r rune) int { switch { @@ -2018,11 +1819,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S98 func(r rune) int { switch { @@ -2042,11 +1841,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S99 func(r rune) int { switch { @@ -2066,11 +1863,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S100 func(r rune) int { switch { @@ -2090,11 +1885,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S101 func(r rune) int { switch { @@ -2114,11 +1907,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S102 func(r rune) int { switch { @@ -2138,11 +1929,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S103 func(r rune) int { switch { @@ -2160,11 +1949,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S104 func(r rune) int { switch { @@ -2182,11 +1969,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S105 func(r rune) int { switch { @@ -2206,11 +1991,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S106 func(r rune) int { switch { @@ -2230,11 +2013,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S107 func(r rune) int { switch { @@ -2254,11 +2035,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S108 func(r rune) int { switch { @@ -2278,11 +2057,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S109 func(r rune) int { switch { @@ -2302,11 +2079,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S110 func(r rune) int { switch { @@ -2326,11 +2101,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S111 func(r rune) int { switch { @@ -2350,11 +2123,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S112 func(r rune) int { switch { @@ -2370,11 +2141,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S113 func(r rune) int { switch { @@ -2394,11 +2163,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S114 func(r rune) int { switch { @@ -2416,11 +2183,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S115 func(r rune) int { switch { @@ -2440,11 +2205,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S116 func(r rune) int { switch { @@ -2462,11 +2225,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S117 func(r rune) int { switch { @@ -2484,11 +2245,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S118 func(r rune) int { switch { @@ -2508,11 +2267,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S119 func(r rune) int { switch { @@ -2532,11 +2289,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S120 func(r rune) int { switch { @@ -2556,11 +2311,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S121 func(r rune) int { switch { @@ -2578,11 +2331,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S122 func(r rune) int { switch { @@ -2600,11 +2351,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S123 func(r rune) int { switch { @@ -2624,11 +2373,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S124 func(r rune) int { switch { @@ -2648,11 +2395,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S125 func(r rune) int { switch { @@ -2672,11 +2417,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S126 func(r rune) int { switch { @@ -2692,11 +2435,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S127 func(r rune) int { switch { @@ -2716,11 +2457,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S128 func(r rune) int { switch { @@ -2740,11 +2479,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S129 func(r rune) int { switch { @@ -2764,11 +2501,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S130 func(r rune) int { switch { @@ -2788,11 +2523,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S131 func(r rune) int { switch { @@ -2812,11 +2545,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S132 func(r rune) int { switch { @@ -2836,11 +2567,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S133 func(r rune) int { switch { @@ -2860,11 +2589,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S134 func(r rune) int { switch { @@ -2880,11 +2607,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S135 func(r rune) int { switch { @@ -2904,11 +2629,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S136 func(r rune) int { switch { @@ -2928,11 +2651,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S137 func(r rune) int { switch { @@ -2952,11 +2673,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S138 func(r rune) int { switch { @@ -2976,11 +2695,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S139 func(r rune) int { switch { @@ -3000,11 +2717,9 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, - // S140 func(r rune) int { switch { @@ -3020,7 +2735,6 @@ var TransTab = TransitionTable{ return 29 case 65534 <= r && r <= 1114111: // [\ufffe,\U0010ffff] return 29 - } return NoState }, diff --git a/graph/formats/dot/internal/parser/actiontable.go b/graph/formats/dot/internal/parser/actiontable.go index bffc8f3c..9596d120 100644 --- a/graph/formats/dot/internal/parser/actiontable.go +++ b/graph/formats/dot/internal/parser/actiontable.go @@ -44,7 +44,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S1 @@ -70,7 +69,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S2 @@ -96,7 +94,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S3 @@ -122,7 +119,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S4 @@ -148,7 +144,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S5 @@ -174,7 +169,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S6 @@ -200,7 +194,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(11), /* id */ - }, }, actionRow{ // S7 @@ -226,7 +219,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(6), /* id, reduce: DirectedGraph */ - }, }, actionRow{ // S8 @@ -252,7 +244,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(7), /* id, reduce: DirectedGraph */ - }, }, actionRow{ // S9 @@ -278,7 +269,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S10 @@ -304,7 +294,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S11 @@ -330,7 +319,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S12 @@ -356,7 +344,6 @@ var actionTab = actionTable{ shift(29), /* subgraph */ nil, /* : */ shift(30), /* id */ - }, }, actionRow{ // S13 @@ -382,7 +369,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S14 @@ -408,7 +394,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S15 @@ -434,7 +419,6 @@ var actionTab = actionTable{ shift(29), /* subgraph */ nil, /* : */ shift(30), /* id */ - }, }, actionRow{ // S16 @@ -460,7 +444,6 @@ var actionTab = actionTable{ reduce(17), /* subgraph, reduce: OptSemi */ nil, /* : */ reduce(17), /* id, reduce: OptSemi */ - }, }, actionRow{ // S17 @@ -486,7 +469,6 @@ var actionTab = actionTable{ reduce(12), /* subgraph, reduce: Stmt */ nil, /* : */ reduce(12), /* id, reduce: Stmt */ - }, }, actionRow{ // S18 @@ -512,7 +494,6 @@ var actionTab = actionTable{ reduce(13), /* subgraph, reduce: Stmt */ nil, /* : */ reduce(13), /* id, reduce: Stmt */ - }, }, actionRow{ // S19 @@ -538,7 +519,6 @@ var actionTab = actionTable{ reduce(14), /* subgraph, reduce: Stmt */ nil, /* : */ reduce(14), /* id, reduce: Stmt */ - }, }, actionRow{ // S20 @@ -564,7 +544,6 @@ var actionTab = actionTable{ reduce(15), /* subgraph, reduce: Stmt */ nil, /* : */ reduce(15), /* id, reduce: Stmt */ - }, }, actionRow{ // S21 @@ -590,7 +569,6 @@ var actionTab = actionTable{ reduce(16), /* subgraph, reduce: Stmt */ nil, /* : */ reduce(16), /* id, reduce: Stmt */ - }, }, actionRow{ // S22 @@ -616,7 +594,6 @@ var actionTab = actionTable{ reduce(32), /* subgraph, reduce: OptAttrList */ nil, /* : */ reduce(32), /* id, reduce: OptAttrList */ - }, }, actionRow{ // S23 @@ -642,7 +619,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S24 @@ -668,7 +644,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S25 @@ -694,7 +669,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S26 @@ -720,7 +694,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S27 @@ -746,7 +719,6 @@ var actionTab = actionTable{ reduce(50), /* subgraph, reduce: OptPort */ shift(46), /* : */ reduce(50), /* id, reduce: OptPort */ - }, }, actionRow{ // S28 @@ -772,7 +744,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S29 @@ -798,7 +769,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(11), /* id */ - }, }, actionRow{ // S30 @@ -824,7 +794,6 @@ var actionTab = actionTable{ reduce(52), /* subgraph, reduce: ID */ reduce(52), /* :, reduce: ID */ reduce(52), /* id, reduce: ID */ - }, }, actionRow{ // S31 @@ -850,7 +819,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S32 @@ -876,7 +844,6 @@ var actionTab = actionTable{ reduce(17), /* subgraph, reduce: OptSemi */ nil, /* : */ reduce(17), /* id, reduce: OptSemi */ - }, }, actionRow{ // S33 @@ -902,7 +869,6 @@ var actionTab = actionTable{ reduce(8), /* subgraph, reduce: StmtList */ nil, /* : */ reduce(8), /* id, reduce: StmtList */ - }, }, actionRow{ // S34 @@ -928,7 +894,6 @@ var actionTab = actionTable{ reduce(18), /* subgraph, reduce: OptSemi */ nil, /* : */ reduce(18), /* id, reduce: OptSemi */ - }, }, actionRow{ // S35 @@ -954,7 +919,6 @@ var actionTab = actionTable{ reduce(19), /* subgraph, reduce: NodeStmt */ nil, /* : */ reduce(19), /* id, reduce: NodeStmt */ - }, }, actionRow{ // S36 @@ -980,7 +944,6 @@ var actionTab = actionTable{ reduce(33), /* subgraph, reduce: OptAttrList */ nil, /* : */ reduce(33), /* id, reduce: OptAttrList */ - }, }, actionRow{ // S37 @@ -1006,7 +969,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(55), /* id */ - }, }, actionRow{ // S38 @@ -1032,7 +994,6 @@ var actionTab = actionTable{ reduce(32), /* subgraph, reduce: OptAttrList */ nil, /* : */ reduce(32), /* id, reduce: OptAttrList */ - }, }, actionRow{ // S39 @@ -1058,7 +1019,6 @@ var actionTab = actionTable{ shift(29), /* subgraph */ nil, /* : */ shift(62), /* id */ - }, }, actionRow{ // S40 @@ -1084,7 +1044,6 @@ var actionTab = actionTable{ reduce(22), /* subgraph, reduce: DirectedEdge */ nil, /* : */ reduce(22), /* id, reduce: DirectedEdge */ - }, }, actionRow{ // S41 @@ -1110,7 +1069,6 @@ var actionTab = actionTable{ reduce(23), /* subgraph, reduce: DirectedEdge */ nil, /* : */ reduce(23), /* id, reduce: DirectedEdge */ - }, }, actionRow{ // S42 @@ -1136,7 +1094,6 @@ var actionTab = actionTable{ reduce(26), /* subgraph, reduce: AttrStmt */ nil, /* : */ reduce(26), /* id, reduce: AttrStmt */ - }, }, actionRow{ // S43 @@ -1162,7 +1119,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(64), /* id */ - }, }, actionRow{ // S44 @@ -1188,7 +1144,6 @@ var actionTab = actionTable{ reduce(47), /* subgraph, reduce: Node */ nil, /* : */ reduce(47), /* id, reduce: Node */ - }, }, actionRow{ // S45 @@ -1214,7 +1169,6 @@ var actionTab = actionTable{ reduce(51), /* subgraph, reduce: OptPort */ nil, /* : */ reduce(51), /* id, reduce: OptPort */ - }, }, actionRow{ // S46 @@ -1240,7 +1194,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(62), /* id */ - }, }, actionRow{ // S47 @@ -1266,7 +1219,6 @@ var actionTab = actionTable{ shift(29), /* subgraph */ nil, /* : */ shift(30), /* id */ - }, }, actionRow{ // S48 @@ -1292,7 +1244,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S49 @@ -1318,7 +1269,6 @@ var actionTab = actionTable{ reduce(9), /* subgraph, reduce: StmtList */ nil, /* : */ reduce(9), /* id, reduce: StmtList */ - }, }, actionRow{ // S50 @@ -1344,7 +1294,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(55), /* id */ - }, }, actionRow{ // S51 @@ -1370,7 +1319,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(38), /* id, reduce: OptSep */ - }, }, actionRow{ // S52 @@ -1396,7 +1344,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S53 @@ -1422,7 +1369,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(55), /* id */ - }, }, actionRow{ // S54 @@ -1448,7 +1394,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S55 @@ -1474,7 +1419,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S56 @@ -1500,7 +1444,6 @@ var actionTab = actionTable{ reduce(20), /* subgraph, reduce: EdgeStmt */ nil, /* : */ reduce(20), /* id, reduce: EdgeStmt */ - }, }, actionRow{ // S57 @@ -1526,7 +1469,6 @@ var actionTab = actionTable{ reduce(46), /* subgraph, reduce: Vertex */ nil, /* : */ reduce(46), /* id, reduce: Vertex */ - }, }, actionRow{ // S58 @@ -1552,7 +1494,6 @@ var actionTab = actionTable{ reduce(45), /* subgraph, reduce: Vertex */ nil, /* : */ reduce(45), /* id, reduce: Vertex */ - }, }, actionRow{ // S59 @@ -1578,7 +1519,6 @@ var actionTab = actionTable{ reduce(24), /* subgraph, reduce: OptEdge */ nil, /* : */ reduce(24), /* id, reduce: OptEdge */ - }, }, actionRow{ // S60 @@ -1604,7 +1544,6 @@ var actionTab = actionTable{ reduce(50), /* subgraph, reduce: OptPort */ shift(46), /* : */ reduce(50), /* id, reduce: OptPort */ - }, }, actionRow{ // S61 @@ -1630,7 +1569,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S62 @@ -1656,7 +1594,6 @@ var actionTab = actionTable{ reduce(52), /* subgraph, reduce: ID */ reduce(52), /* :, reduce: ID */ reduce(52), /* id, reduce: ID */ - }, }, actionRow{ // S63 @@ -1682,7 +1619,6 @@ var actionTab = actionTable{ reduce(41), /* subgraph, reduce: Attr */ nil, /* : */ reduce(41), /* id, reduce: Attr */ - }, }, actionRow{ // S64 @@ -1708,7 +1644,6 @@ var actionTab = actionTable{ reduce(52), /* subgraph, reduce: ID */ nil, /* : */ reduce(52), /* id, reduce: ID */ - }, }, actionRow{ // S65 @@ -1734,7 +1669,6 @@ var actionTab = actionTable{ reduce(48), /* subgraph, reduce: Port */ shift(77), /* : */ reduce(48), /* id, reduce: Port */ - }, }, actionRow{ // S66 @@ -1760,7 +1694,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S67 @@ -1786,7 +1719,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S68 @@ -1812,7 +1744,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(39), /* id, reduce: OptSep */ - }, }, actionRow{ // S69 @@ -1838,7 +1769,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(34), /* id, reduce: AList */ - }, }, actionRow{ // S70 @@ -1864,7 +1794,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(40), /* id, reduce: OptSep */ - }, }, actionRow{ // S71 @@ -1890,7 +1819,6 @@ var actionTab = actionTable{ reduce(30), /* subgraph, reduce: AttrList */ nil, /* : */ reduce(30), /* id, reduce: AttrList */ - }, }, actionRow{ // S72 @@ -1916,7 +1844,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(38), /* id, reduce: OptSep */ - }, }, actionRow{ // S73 @@ -1942,7 +1869,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(82), /* id */ - }, }, actionRow{ // S74 @@ -1968,7 +1894,6 @@ var actionTab = actionTable{ reduce(25), /* subgraph, reduce: OptEdge */ nil, /* : */ reduce(25), /* id, reduce: OptEdge */ - }, }, actionRow{ // S75 @@ -1994,7 +1919,6 @@ var actionTab = actionTable{ reduce(21), /* subgraph, reduce: Edge */ nil, /* : */ reduce(21), /* id, reduce: Edge */ - }, }, actionRow{ // S76 @@ -2020,7 +1944,6 @@ var actionTab = actionTable{ shift(29), /* subgraph */ nil, /* : */ shift(30), /* id */ - }, }, actionRow{ // S77 @@ -2046,7 +1969,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ shift(85), /* id */ - }, }, actionRow{ // S78 @@ -2072,7 +1994,6 @@ var actionTab = actionTable{ reduce(42), /* subgraph, reduce: Subgraph */ nil, /* : */ reduce(42), /* id, reduce: Subgraph */ - }, }, actionRow{ // S79 @@ -2098,7 +2019,6 @@ var actionTab = actionTable{ reduce(31), /* subgraph, reduce: AttrList */ nil, /* : */ reduce(31), /* id, reduce: AttrList */ - }, }, actionRow{ // S80 @@ -2124,7 +2044,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(35), /* id, reduce: AList */ - }, }, actionRow{ // S81 @@ -2150,7 +2069,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(41), /* id, reduce: Attr */ - }, }, actionRow{ // S82 @@ -2176,7 +2094,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ reduce(52), /* id, reduce: ID */ - }, }, actionRow{ // S83 @@ -2202,7 +2119,6 @@ var actionTab = actionTable{ nil, /* subgraph */ nil, /* : */ nil, /* id */ - }, }, actionRow{ // S84 @@ -2228,7 +2144,6 @@ var actionTab = actionTable{ reduce(49), /* subgraph, reduce: Port */ nil, /* : */ reduce(49), /* id, reduce: Port */ - }, }, actionRow{ // S85 @@ -2254,7 +2169,6 @@ var actionTab = actionTable{ reduce(52), /* subgraph, reduce: ID */ nil, /* : */ reduce(52), /* id, reduce: ID */ - }, }, actionRow{ // S86 @@ -2280,7 +2194,6 @@ var actionTab = actionTable{ reduce(42), /* subgraph, reduce: Subgraph */ nil, /* : */ reduce(42), /* id, reduce: Subgraph */ - }, }, } diff --git a/graph/formats/dot/internal/parser/gototable.go b/graph/formats/dot/internal/parser/gototable.go index b4539576..9c55e43d 100644 --- a/graph/formats/dot/internal/parser/gototable.go +++ b/graph/formats/dot/internal/parser/gototable.go @@ -51,7 +51,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S1 -1, // S' @@ -84,7 +83,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S2 -1, // S' @@ -117,7 +115,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S3 -1, // S' @@ -150,7 +147,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S4 -1, // S' @@ -183,7 +179,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S5 -1, // S' @@ -216,7 +211,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S6 -1, // S' @@ -249,7 +243,6 @@ var gotoTab = gotoTable{ -1, // OptPort 10, // ID 9, // OptID - }, gotoRow{ // S7 -1, // S' @@ -282,7 +275,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S8 -1, // S' @@ -315,7 +307,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S9 -1, // S' @@ -348,7 +339,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S10 -1, // S' @@ -381,7 +371,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S11 -1, // S' @@ -414,7 +403,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S12 -1, // S' @@ -447,7 +435,6 @@ var gotoTab = gotoTable{ -1, // OptPort 27, // ID -1, // OptID - }, gotoRow{ // S13 -1, // S' @@ -480,7 +467,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S14 -1, // S' @@ -513,7 +499,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S15 -1, // S' @@ -546,7 +531,6 @@ var gotoTab = gotoTable{ -1, // OptPort 27, // ID -1, // OptID - }, gotoRow{ // S16 -1, // S' @@ -579,7 +563,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S17 -1, // S' @@ -612,7 +595,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S18 -1, // S' @@ -645,7 +627,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S19 -1, // S' @@ -678,7 +659,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S20 -1, // S' @@ -711,7 +691,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S21 -1, // S' @@ -744,7 +723,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S22 -1, // S' @@ -777,7 +755,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S23 -1, // S' @@ -810,7 +787,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S24 -1, // S' @@ -843,7 +819,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S25 -1, // S' @@ -876,7 +851,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S26 -1, // S' @@ -909,7 +883,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S27 -1, // S' @@ -942,7 +915,6 @@ var gotoTab = gotoTable{ 44, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S28 -1, // S' @@ -975,7 +947,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S29 -1, // S' @@ -1008,7 +979,6 @@ var gotoTab = gotoTable{ -1, // OptPort 10, // ID 48, // OptID - }, gotoRow{ // S30 -1, // S' @@ -1041,7 +1011,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S31 -1, // S' @@ -1074,7 +1043,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S32 -1, // S' @@ -1107,7 +1075,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S33 -1, // S' @@ -1140,7 +1107,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S34 -1, // S' @@ -1173,7 +1139,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S35 -1, // S' @@ -1206,7 +1171,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S36 -1, // S' @@ -1239,7 +1203,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S37 -1, // S' @@ -1272,7 +1235,6 @@ var gotoTab = gotoTable{ -1, // OptPort 54, // ID -1, // OptID - }, gotoRow{ // S38 -1, // S' @@ -1305,7 +1267,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S39 -1, // S' @@ -1338,7 +1299,6 @@ var gotoTab = gotoTable{ -1, // OptPort 60, // ID -1, // OptID - }, gotoRow{ // S40 -1, // S' @@ -1371,7 +1331,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S41 -1, // S' @@ -1404,7 +1363,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S42 -1, // S' @@ -1437,7 +1395,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S43 -1, // S' @@ -1470,7 +1427,6 @@ var gotoTab = gotoTable{ -1, // OptPort 63, // ID -1, // OptID - }, gotoRow{ // S44 -1, // S' @@ -1503,7 +1459,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S45 -1, // S' @@ -1536,7 +1491,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S46 -1, // S' @@ -1569,7 +1523,6 @@ var gotoTab = gotoTable{ -1, // OptPort 65, // ID -1, // OptID - }, gotoRow{ // S47 -1, // S' @@ -1602,7 +1555,6 @@ var gotoTab = gotoTable{ -1, // OptPort 27, // ID -1, // OptID - }, gotoRow{ // S48 -1, // S' @@ -1635,7 +1587,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S49 -1, // S' @@ -1668,7 +1619,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S50 -1, // S' @@ -1701,7 +1651,6 @@ var gotoTab = gotoTable{ -1, // OptPort 54, // ID -1, // OptID - }, gotoRow{ // S51 -1, // S' @@ -1734,7 +1683,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S52 -1, // S' @@ -1767,7 +1715,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S53 -1, // S' @@ -1800,7 +1747,6 @@ var gotoTab = gotoTable{ -1, // OptPort 54, // ID -1, // OptID - }, gotoRow{ // S54 -1, // S' @@ -1833,7 +1779,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S55 -1, // S' @@ -1866,7 +1811,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S56 -1, // S' @@ -1899,7 +1843,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S57 -1, // S' @@ -1932,7 +1875,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S58 -1, // S' @@ -1965,7 +1907,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S59 -1, // S' @@ -1998,7 +1939,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S60 -1, // S' @@ -2031,7 +1971,6 @@ var gotoTab = gotoTable{ 44, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S61 -1, // S' @@ -2064,7 +2003,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S62 -1, // S' @@ -2097,7 +2035,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S63 -1, // S' @@ -2130,7 +2067,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S64 -1, // S' @@ -2163,7 +2099,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S65 -1, // S' @@ -2196,7 +2131,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S66 -1, // S' @@ -2229,7 +2163,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S67 -1, // S' @@ -2262,7 +2195,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S68 -1, // S' @@ -2295,7 +2227,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S69 -1, // S' @@ -2328,7 +2259,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S70 -1, // S' @@ -2361,7 +2291,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S71 -1, // S' @@ -2394,7 +2323,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S72 -1, // S' @@ -2427,7 +2355,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S73 -1, // S' @@ -2460,7 +2387,6 @@ var gotoTab = gotoTable{ -1, // OptPort 81, // ID -1, // OptID - }, gotoRow{ // S74 -1, // S' @@ -2493,7 +2419,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S75 -1, // S' @@ -2526,7 +2451,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S76 -1, // S' @@ -2559,7 +2483,6 @@ var gotoTab = gotoTable{ -1, // OptPort 27, // ID -1, // OptID - }, gotoRow{ // S77 -1, // S' @@ -2592,7 +2515,6 @@ var gotoTab = gotoTable{ -1, // OptPort 84, // ID -1, // OptID - }, gotoRow{ // S78 -1, // S' @@ -2625,7 +2547,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S79 -1, // S' @@ -2658,7 +2579,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S80 -1, // S' @@ -2691,7 +2611,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S81 -1, // S' @@ -2724,7 +2643,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S82 -1, // S' @@ -2757,7 +2675,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S83 -1, // S' @@ -2790,7 +2707,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S84 -1, // S' @@ -2823,7 +2739,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S85 -1, // S' @@ -2856,7 +2771,6 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, gotoRow{ // S86 -1, // S' @@ -2889,6 +2803,5 @@ var gotoTab = gotoTable{ -1, // OptPort -1, // ID -1, // OptID - }, } diff --git a/graph/formats/dot/internal/parser/parser.go b/graph/formats/dot/internal/parser/parser.go index 450abd12..949ac3b8 100644 --- a/graph/formats/dot/internal/parser/parser.go +++ b/graph/formats/dot/internal/parser/parser.go @@ -36,7 +36,8 @@ type stack struct { const iNITIAL_STACK_SIZE = 100 func newStack() *stack { - return &stack{state: make([]int, 0, iNITIAL_STACK_SIZE), + return &stack{ + state: make([]int, 0, iNITIAL_STACK_SIZE), attrib: make([]Attrib, 0, iNITIAL_STACK_SIZE), } } @@ -196,7 +197,6 @@ func (this *Parser) Parse(scanner Scanner) (res interface{}, err error) { panic("Error recovery led to invalid action") } } - // fmt.Printf("S%d %s %s\n", this.stack.top(), token.TokMap.TokenString(this.nextToken), action.String()) switch act := action.(type) { diff --git a/graph/formats/dot/makeinternal.bash b/graph/formats/dot/makeinternal.bash new file mode 100755 index 00000000..df377163 --- /dev/null +++ b/graph/formats/dot/makeinternal.bash @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +cd internal +make clean && make