annotate trunk/src/cmd/Generate.d @ 682:7541c64fc423

Renamed FunctionBody, CatchBody and FinallyBody. FunctionBody -> FuncBodyStatement, CatchBody -> CatchStatement, FinallyBody -> FinallyStatement.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Sat, 19 Jan 2008 20:35:45 +0100
parents 95a3c28c0f64
children 170ddcdc9711
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
1 /++
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
2 Author: Aziz Köksal
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
3 License: GPL3
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
4 +/
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
5 module cmd.Generate;
578
c769bc239006 Moved Parser.d to new package 'parser'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 576
diff changeset
6
580
fa6d3c52757d Moved SyntaxTree.d to new package 'ast'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 578
diff changeset
7 import dil.ast.Node;
596
39fac5531b85 Moved dil.Token to dil.lexer.Token.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 582
diff changeset
8 import dil.lexer.Lexer;
578
c769bc239006 Moved Parser.d to new package 'parser'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 576
diff changeset
9 import dil.parser.Parser;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
10 import dil.File;
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
11 import tango.io.Print;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
12 import common;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
13
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
14 /// Options for the generate command.
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
15 enum DocOption
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
16 {
392
bb935c6f9b7a Applied fixes and improvements to the Lexer class.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
17 Empty,
bb935c6f9b7a Applied fixes and improvements to the Lexer class.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
18 Tokens = 1,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
19 Syntax = 1<<1,
392
bb935c6f9b7a Applied fixes and improvements to the Lexer class.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
20 HTML = 1<<2,
bb935c6f9b7a Applied fixes and improvements to the Lexer class.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
21 XML = 1<<3
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
22 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
23
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
24 /// Executes the command.
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
25 void execute(string filePath, DocOption options)
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 363
diff changeset
26 {
392
bb935c6f9b7a Applied fixes and improvements to the Lexer class.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
27 assert(options != DocOption.Empty);
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 363
diff changeset
28 if (options & DocOption.Syntax)
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
29 syntaxToDoc(filePath, Stdout, options);
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 363
diff changeset
30 else
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
31 tokensToDoc(filePath, Stdout, options);
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 363
diff changeset
32 }
1059295c2727 - Every command module has an execute method now.
aziz
parents: 363
diff changeset
33
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
34 /// Escapes the characters '<', '>' and '&' with named character entities.
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
35 char[] xml_escape(char[] text)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
36 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
37 char[] result;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
38 foreach(c; text)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
39 switch(c)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
40 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
41 case '<': result ~= "&lt;"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
42 case '>': result ~= "&gt;"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
43 case '&': result ~= "&amp;"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
44 default: result ~= c;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
45 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
46 return result;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
47 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
48
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
49
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
50 /// Find object in subject and return position.
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
51 /// Returns -1 if no match was found.
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
52 /+int find(char[] subject, char[] object)
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
53 {
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
54 if (object.length > subject.length)
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
55 return -1;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
56 foreach (i, c; subject)
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
57 {
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
58 if (c == object[0])
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
59 {
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
60 if (object.length > (subject.length - i))
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
61 return -1;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
62 if (object == subject[i..i+object.length])
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
63 return i;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
64 }
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
65 }
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
66 return -1;
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
67 }+/
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
68
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
69 /++
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
70 Find the last occurrence of object in subject.
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
71 Returns the index if found, or -1 if not.
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
72 +/
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
73 int rfind(char[] subject, char object)
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
74 {
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
75 foreach_reverse(i, c; subject)
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
76 if (c == object)
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
77 return i;
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
78 return -1;
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
79 }
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
80
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
81 /// Returns the short class name of an instance descending from Node.
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
82 char[] getShortClassName(Node node)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
83 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
84 static char[][] name_table;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
85 if (name_table is null)
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
86 name_table = new char[][NodeKind.max+1]; // Create a new table.
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
87 // Look up in table.
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
88 char[] name = name_table[node.kind];
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
89 if (name !is null)
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
90 return name; // Return cached name.
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
91
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
92 name = node.classinfo.name; // Get the fully qualified name of the class.
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
93 name = name[rfind(name, '.')+1 .. $]; // Remove package and module name.
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
94
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
95 uint suffixLength;
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
96 switch (node.category)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
97 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
98 alias NodeCategory NC;
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
99 case NC.Declaration:
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
100 suffixLength = "Declaration".length;
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
101 break;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
102 case NC.Statement:
682
7541c64fc423 Renamed FunctionBody, CatchBody and FinallyBody.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 681
diff changeset
103 suffixLength = "Statement".length;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
104 break;
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
105 case NC.Expression:
640
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
106 switch (node.kind)
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
107 {
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
108 case NodeKind.VoidInitializer,
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
109 NodeKind.ArrayInitializer,
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
110 NodeKind.StructInitializer:
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
111 break;
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
112 default:
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
113 suffixLength = "Expression".length;
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
114 }
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
115 break;
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
116 case NC.Type:
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
117 suffixLength = "Type".length;
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
118 break;
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
119 case NC.Other:
640
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
120 break;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
121 default:
640
05645f5613c1 Added an error message.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 619
diff changeset
122 assert(0);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
123 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
124 // Remove common suffix.
581
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
125 name = name[0 .. $ - suffixLength];
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
126 // Store the name in the table.
61f9784aaf2a Improved function getShortClassName().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
127 name_table[node.kind] = name;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
128 return name;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
129 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
130
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
131 /// Indices into the XML and HTML tag arrays.
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
132 enum DocPart
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
133 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
134 Head,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
135 CompBegin,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
136 CompEnd,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
137 Error,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
138 SyntaxBegin,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
139 SyntaxEnd,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
140 SrcBegin,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
141 SrcEnd,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
142 Tail,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
143 // Tokens:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
144 Identifier,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
145 Comment,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
146 StringLiteral,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
147 CharLiteral,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
148 Operator,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
149 LorG,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
150 LessEqual,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
151 GreaterEqual,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
152 AndLogical,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
153 OrLogical,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
154 NotEqual,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
155 Not,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
156 Number,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
157 Bracket,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
158 SpecialToken,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
159 Shebang,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
160 Keyword,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
161 HLineBegin,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
162 HLineEnd,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
163 Filespec,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
164 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
165
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
166 auto html_tags = [
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
167 // Head
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
168 `<html>`\n
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
169 `<head>`\n
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
170 `<meta http-equiv="Content-Type" content="text/html; charset=utf-8">`\n
598
4ba8157bde1f Renamed dil_html.css/dil_xml.css to html.css/xml.css.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
171 `<link href="html.css" rel="stylesheet" type="text/css">`\n
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
172 `</head>`\n
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
173 `<body>`[],
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
174 // CompBegin
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
175 `<div class="compilerinfo">`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
176 // CompEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
177 `</div>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
178 // Error
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
179 `<p class="error {0}">{1}({2}){3}: {4}</p>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
180 // SyntaxBegin
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
181 `<span class="{0} {1}">`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
182 // SyntaxEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
183 `</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
184 // SrcBegin
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
185 `<pre class="sourcecode">`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
186 // SrcEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
187 `</pre>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
188 // Tail
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
189 `</html>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
190 // Identifier
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
191 `<span class="i">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
192 // Comment
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
193 `<span class="c{0}">{1}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
194 // StringLiteral
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
195 `<span class="sl">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
196 // CharLiteral
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
197 `<span class="cl">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
198 // Operator
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
199 `<span class="op">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
200 // LorG
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
201 `<span class="oplg">&lt;&gt;</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
202 // LessEqual
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
203 `<span class="ople">&lt;=</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
204 // GreaterEqual
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
205 `<span class="opge">&gt;=</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
206 // AndLogical
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
207 `<span class="opaa">&amp;&amp;</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
208 // OrLogical
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
209 `<span class="opoo">||</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
210 // NotEqual
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
211 `<span class="opne">!=</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
212 // Not
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
213 `<span class="opn">!</span>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
214 // Number
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
215 `<span class="n">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
216 // Bracket
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
217 `<span class="br">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
218 // SpecialToken
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
219 `<span class="st">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
220 // Shebang
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
221 `<span class="shebang">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
222 // Keyword
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
223 `<span class="k">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
224 // HLineBegin
388
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
225 `<span class="hl">`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
226 // HLineEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
227 "</span>",
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
228 // Filespec
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
229 `<span class="fs">{0}</span>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
230 ];
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
231
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
232 auto xml_tags = [
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
233 // Head
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
234 `<?xml version="1.0"?>`\n
598
4ba8157bde1f Renamed dil_html.css/dil_xml.css to html.css/xml.css.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
235 `<?xml-stylesheet href="xml.css" type="text/css"?>`\n
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
236 `<root>`[],
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
237 // CompBegin
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
238 `<compilerinfo>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
239 // CompEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
240 `</compilerinfo>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
241 // Error
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
242 `<error t="{0}">{1}({2}){3}: {4}</error>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
243 // SyntaxBegin
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
244 `<{0} t="{1}">`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
245 // SyntaxEnd
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
246 `</{0}>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
247 // SrcBegin
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
248 `<sourcecode>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
249 // SrcEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
250 `</sourcecode>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
251 // Tail
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
252 `</root>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
253 // Identifier
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
254 "<i>{0}</i>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
255 // Comment
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
256 `<c t="{0}">{1}</c>`,
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
257 // StringLiteral
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
258 "<sl>{0}</sl>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
259 // CharLiteral
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
260 "<cl>{0}</cl>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
261 // Operator
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
262 "<op>{0}</op>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
263 // LorG
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
264 `<op t="lg">&lt;&gt;</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
265 // LessEqual
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
266 `<op t="le">&lt;=</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
267 // GreaterEqual
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
268 `<op t="ge">&gt;=</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
269 // AndLogical
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
270 `<op t="aa">&amp;&amp;</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
271 // OrLogical
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
272 `<op t="oo">||</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
273 // NotEqual
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
274 `<op t="ne">!=</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
275 // Not
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
276 `<op t="n">!</op>`,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
277 // Number
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
278 "<n>{0}</n>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
279 // Bracket
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
280 "<br>{0}</br>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
281 // SpecialToken
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
282 "<st>{0}</st>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
283 // Shebang
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
284 "<shebang>{0}</shebang>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
285 // Keyword
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
286 "<k>{0}</k>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
287 // HLineBegin
388
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
288 "<hl>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
289 // HLineEnd
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
290 "</hl>",
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
291 // Filespec
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
292 "<fs>{0}</fs>",
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
293 ];
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
294
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
295 // The size of the arrays must equal the number of members in enum DocPart.
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
296 static assert(html_tags.length == DocPart.max+1);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
297 static assert(xml_tags.length == DocPart.max+1);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
298
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
299 /// Prints the syntax tree of a source file using the buffer print.
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
300 void syntaxToDoc(string filePath, Print!(char) print, DocOption options)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
301 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
302 auto tags = options & DocOption.HTML ? html_tags : xml_tags;
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
303 auto sourceText = loadFile(filePath);
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
304 auto parser = new Parser(sourceText, filePath);
368
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 364
diff changeset
305 auto root = parser.start();
619
933cd8d24467 Renamed Parser.lx to Parser.lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 598
diff changeset
306 auto lx = parser.lexer;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
307
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
308 auto token = lx.head;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
309
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
310 print(tags[DocPart.Head]~\n);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
311 // Output error messages.
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
312 if (lx.errors.length || parser.errors.length)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
313 {
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
314 print(tags[DocPart.CompBegin]~\n);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
315 foreach (error; lx.errors)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
316 {
422
ad7977fe315a Added support for column numbers in error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
317 print.formatln(tags[DocPart.Error], "L", error.filePath, Format("{0},{1}", error.loc, error.col), "L", xml_escape(error.getMsg));
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
318 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
319 foreach (error; parser.errors)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
320 {
422
ad7977fe315a Added support for column numbers in error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
321 print.formatln(tags[DocPart.Error], "P", error.filePath, Format("{0},{1}", error.loc, error.col), "P", xml_escape(error.getMsg));
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
322 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
323 print(tags[DocPart.CompEnd]~\n);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
324 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
325 print(tags[DocPart.SrcBegin]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
326
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
327 Node[][Token*] beginNodes, endNodes;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
328
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
329 void populateAAs(Node[] nodes)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
330 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
331 foreach (node; nodes)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
332 {
396
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
333 assert(delegate bool(){
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
334 foreach (child; node.children)
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
335 if (child is null)
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
336 return false;
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
337 return true;
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
338 }() == true, Format("Node '{0}' has a null child", node.classinfo.name)
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
339 );
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
340 auto begin = node.begin;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
341 if (begin)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
342 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
343 auto end = node.end;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
344 assert(end);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
345 beginNodes[begin] ~= node;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
346 endNodes[end] ~= node;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
347 }
396
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
348
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
349 if (node.children.length)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
350 populateAAs(node.children);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
351 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
352 }
396
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
353 assert(delegate bool(){
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
354 foreach (child; root.children)
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
355 if (child is null)
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
356 return false;
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
357 return true;
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
358 }() == true, Format("Root node has a null child")
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 394
diff changeset
359 );
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
360 populateAAs(root.children);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
361
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
362 char[] getTag(NodeCategory nc)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
363 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
364 char[] tag;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
365 switch (nc)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
366 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
367 alias NodeCategory NC;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
368 case NC.Declaration: tag = "d"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
369 case NC.Statement: tag = "s"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
370 case NC.Expression: tag = "e"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
371 case NC.Type: tag = "t"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
372 case NC.Other: tag = "o"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
373 default:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
374 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
375 return tag;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
376 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
377
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
378 // Traverse linked list and print tokens.
679
ff6971637f88 Renamed Token member type to kind.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 668
diff changeset
379 while (token.kind != TOK.EOF)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
380 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
381 token = token.next;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
382
394
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
383 // Print whitespace.
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
384 if (token.ws)
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
385 print(token.ws[0..token.start - token.ws]);
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
386
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
387 Node[]* nodes = token in beginNodes;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
388
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
389 if (nodes)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
390 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
391 foreach (node; *nodes)
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
392 print.format(tags[DocPart.SyntaxBegin], getTag(node.category), getShortClassName(node));
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
393 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
394
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
395 printToken(token, tags, print);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
396
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
397 nodes = token in endNodes;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
398
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
399 if (nodes)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
400 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
401 foreach_reverse (node; *nodes)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
402 if (options & DocOption.HTML)
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
403 print(tags[DocPart.SyntaxEnd]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
404 else
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
405 print.format(tags[DocPart.SyntaxEnd], getTag(node.category));
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
406 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
407 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
408 print(\n~tags[DocPart.SrcEnd])(\n~tags[DocPart.Tail]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
409 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
410
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
411 /// Prints all tokens of a source file using the buffer print.
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
412 void tokensToDoc(string filePath, Print!(char) print, DocOption options)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
413 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
414 auto tags = options & DocOption.HTML ? html_tags : xml_tags;
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
415 auto sourceText = loadFile(filePath);
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
416 auto lx = new Lexer(sourceText, filePath);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
417
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
418 auto token = lx.getTokens();
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
419
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
420 print(tags[DocPart.Head]~\n);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
421
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
422 if (lx.errors.length)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
423 {
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
424 print(tags[DocPart.CompBegin]~\n);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
425 foreach (error; lx.errors)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
426 {
422
ad7977fe315a Added support for column numbers in error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
427 print.formatln(tags[DocPart.Error], "L", error.filePath, Format("{0},{1}", error.loc, error.col), "L", xml_escape(error.getMsg));
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
428 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
429 print(tags[DocPart.CompEnd]~\n);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
430 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
431 print(tags[DocPart.SrcBegin]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
432
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
433 // Traverse linked list and print tokens.
679
ff6971637f88 Renamed Token member type to kind.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 668
diff changeset
434 while (token.kind != TOK.EOF)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
435 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
436 token = token.next;
394
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
437 // Print whitespace.
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
438 if (token.ws)
6440da4adb07 Fixed forward references of enum MID complaints by compiler.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 392
diff changeset
439 print(token.ws[0..token.start - token.ws]);
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
440 printToken(token, tags, print);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
441 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
442 print(\n~tags[DocPart.SrcEnd])(\n~tags[DocPart.Tail]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
443 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
444
582
724603deed37 Added comments and renamed a few variables.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 581
diff changeset
445 /// Prints a token with tags using the buffer print.
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
446 void printToken(Token* token, string[] tags, Print!(char) print)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
447 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
448 alias DocPart DP;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
449 string srcText = xml_escape(token.srcText);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
450
679
ff6971637f88 Renamed Token member type to kind.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 668
diff changeset
451 switch(token.kind)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
452 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
453 case TOK.Identifier:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
454 print.format(tags[DP.Identifier], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
455 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
456 case TOK.Comment:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
457 string t;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
458 switch (token.start[1])
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
459 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
460 case '/': t = "l"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
461 case '*': t = "b"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
462 case '+': t = "n"; break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
463 default:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
464 assert(0);
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
465 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
466 print.format(tags[DP.Comment], t, srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
467 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
468 case TOK.String:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
469 print.format(tags[DP.StringLiteral], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
470 break;
507
996041463028 Removed TOK.WCharLiteral and TOK.DCharLiteral.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
471 case TOK.CharLiteral:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
472 print.format(tags[DP.CharLiteral], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
473 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
474 case TOK.Assign, TOK.Equal,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
475 TOK.Less, TOK.Greater,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
476 TOK.LShiftAssign, TOK.LShift,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
477 TOK.RShiftAssign, TOK.RShift,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
478 TOK.URShiftAssign, TOK.URShift,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
479 TOK.OrAssign, TOK.OrBinary,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
480 TOK.AndAssign, TOK.AndBinary,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
481 TOK.PlusAssign, TOK.PlusPlus, TOK.Plus,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
482 TOK.MinusAssign, TOK.MinusMinus, TOK.Minus,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
483 TOK.DivAssign, TOK.Div,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
484 TOK.MulAssign, TOK.Mul,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
485 TOK.ModAssign, TOK.Mod,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
486 TOK.XorAssign, TOK.Xor,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
487 TOK.CatAssign,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
488 TOK.Tilde,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
489 TOK.Unordered,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
490 TOK.UorE,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
491 TOK.UorG,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
492 TOK.UorGorE,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
493 TOK.UorL,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
494 TOK.UorLorE,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
495 TOK.LorEorG:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
496 print.format(tags[DP.Operator], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
497 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
498 case TOK.LorG:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
499 print(tags[DP.LorG]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
500 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
501 case TOK.LessEqual:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
502 print(tags[DP.LessEqual]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
503 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
504 case TOK.GreaterEqual:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
505 print(tags[DP.GreaterEqual]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
506 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
507 case TOK.AndLogical:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
508 print(tags[DP.AndLogical]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
509 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
510 case TOK.OrLogical:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
511 print(tags[DP.OrLogical]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
512 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
513 case TOK.NotEqual:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
514 print(tags[DP.NotEqual]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
515 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
516 case TOK.Not:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
517 // Check if this is part of a template instantiation.
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
518 // TODO: comments aren't skipped. Use Token.nextNWS and Token.prevNWS
679
ff6971637f88 Renamed Token member type to kind.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 668
diff changeset
519 if (token.prev.kind == TOK.Identifier && token.next.kind == TOK.LParen)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
520 goto default;
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
521 print(tags[DP.Not]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
522 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
523 case TOK.Int32, TOK.Int64, TOK.Uint32, TOK.Uint64,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
524 TOK.Float32, TOK.Float64, TOK.Float80,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
525 TOK.Imaginary32, TOK.Imaginary64, TOK.Imaginary80:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
526 print.format(tags[DP.Number], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
527 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
528 case TOK.LParen, TOK.RParen, TOK.LBracket,
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
529 TOK.RBracket, TOK.LBrace, TOK.RBrace:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
530 print.format(tags[DP.Bracket], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
531 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
532 case TOK.Shebang:
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
533 print.format(tags[DP.Shebang], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
534 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
535 case TOK.HashLine:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
536 void printWS(char* start, char* end)
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
537 {
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
538 if (start != end)
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
539 print(start[0 .. end - start]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
540 }
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
541 print(tags[DP.HLineBegin]);
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
542 auto num = token.tokLineNum;
388
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
543 if (num is null)
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
544 {
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
545 print(token.srcText);
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
546 print(tags[DP.HLineEnd]);
388
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
547 break;
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
548 }
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
549 // Print whitespace between #line and number
388
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
550 auto ptr = token.start;
ae154eceba65 Applied some fixes to scanning and printing #line tokens.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
551 printWS(ptr, num.start); // prints "#line" as well
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
552 printToken(num, tags, print);
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
553 if (token.tokLineFilespec)
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
554 {
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
555 auto filespec = token.tokLineFilespec;
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
556 // Print whitespace between number and filespec
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
557 printWS(num.end, filespec.start);
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
558 print.format(tags[DP.Filespec], xml_escape(filespec.srcText));
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
559
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
560 ptr = filespec.end;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
561 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
562 else
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
563 ptr = num.end;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
564 // Print remaining whitespace
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
565 printWS(ptr, token.end);
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
566 print(tags[DP.HLineEnd]);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
567 break;
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
568 default:
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
569 if (token.isKeyword())
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
570 print.format(tags[DP.Keyword], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
571 else if (token.isSpecialToken)
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
572 print.format(tags[DP.SpecialToken], srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
573 else
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 390
diff changeset
574 print(srcText);
363
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
575 }
2b387a3c6b58 - Added package cmd.
aziz
parents:
diff changeset
576 }