From 28ad262a462db5d02ffc046a6682fbe1dbfac5f9 Mon Sep 17 00:00:00 2001 From: Araq Date: Mon, 29 Jul 2013 23:52:08 +0200 Subject: 'nimrod pretty': next steps, doesn't work yet --- compiler/main.nim | 1 + compiler/pretty.nim | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/compiler/main.nim b/compiler/main.nim index d8d8dc8db..6df21f660 100644 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -170,6 +170,7 @@ proc CommandPrettyOld = renderModule(module, getOutFile(mainCommandArg(), "pretty." & NimExt)) proc CommandPretty = + msgs.gErrorMax = high(int) # do not stop after first error semanticPasses() registerPass(prettyPass) compileProject() diff --git a/compiler/pretty.nim b/compiler/pretty.nim index 92de96755..3d59f7e36 100644 --- a/compiler/pretty.nim +++ b/compiler/pretty.nim @@ -25,12 +25,13 @@ type fullpath: string var - gSourceFiles: seq[TSourceFile] + gSourceFiles: seq[TSourceFile] = @[] proc loadFile(info: TLineInfo) = let i = info.fileIndex if i >= gSourceFiles.len: - gSourceFiles.setLen(i) + gSourceFiles.setLen(i+1) + if gSourceFiles[i].lines.isNil: gSourceFiles[i].lines = @[] let path = info.toFullPath gSourceFiles[i].fullpath = path @@ -80,11 +81,14 @@ proc identLen(line: string, start: int): int = inc result proc differ(line: string, a, b: int, x: string): bool = - var j = 0 - for i in a..b: - if line[i] != x[j]: return true - inc j - return false + let y = line[a..b] + result = cmpIgnoreStyle(y, x) == 0 and y != x + when false: + var j = 0 + for i in a..b: + if line[i] != x[j]: return true + inc j + return false var cannotRename = initIntSet() @@ -106,6 +110,8 @@ proc processSym(c: PPassContext, n: PNode): PNode = let line = gSourceFiles[n.info.fileIndex].lines[n.info.line-1] var first = n.info.col.int - len(s.name.s) + if first < 0: return + #inc first, skipIgnoreCase(line, "proc ", first) if line[first] == '`': inc first if {sfImportc, sfExportc} * s.flags != {}: -- cgit 1.4.1-2-gfad0 /option>
path: root/compiler/nimsets.nim
blob: b00353e2003fa415bc9ef107634cf156da20d3b6 (plain) (tree) 
e25474154 ^


2781fea9e ^

4f1b89c30 ^

e25474154 ^





2781fea9e ^

e25474154 ^

d68181246 ^

669a56449 ^

a4e2b0c15 ^

e25474154 ^

5bf31fcab ^


d68181246 ^

5bf31fcab ^

674c05f42 ^

d68181246 ^


e25474154 ^

d68181246 ^

e25474154 ^

d68181246 ^


e25474154 ^



5bf31fcab ^

02b1503e1 ^


d5a5c2291 ^

e25474154 ^

d5a5c2291 ^

674c05f42 ^

e25474154 ^

674c05f42 ^


e25474154 ^

674c05f42 ^

e25474154 ^


5bf31fcab ^

e25474154 ^

5bf31fcab ^

674c05f42 ^

5bf31fcab ^

674c05f42 ^

d68181246 ^


e25474154 ^

d68181246 ^

e25474154 ^

d68181246 ^

e25474154 ^

d68181246 ^

e25474154 ^



a4e2b0c15 ^

e25474154 ^

a4e2b0c15 ^


d68181246 ^


e25474154 ^

d68181246 ^

92b8fac94 ^

e25474154 ^

d68181246 ^

92b8fac94 ^

d68181246 ^

a4e2b0c15 ^

d68181246 ^

e25474154 ^




a4e2b0c15 ^

e25474154 ^




d68181246 ^


e25474154 ^


d68181246 ^

92b8fac94 ^

d68181246 ^

92b8fac94 ^

f92f00b02 ^


d68181246 ^

f92f00b02 ^

d68181246 ^

e25474154 ^


f92f00b02 ^




e25474154 ^


92b8fac94 ^

e25474154 ^

39ebe2175 ^

e25474154 ^

a4e2b0c15 ^


6f1fc1b5b ^

a4e2b0c15 ^

e25474154 ^

a4e2b0c15 ^




e25474154 ^

a4e2b0c15 ^

e25474154 ^

a4e2b0c15 ^


e25474154 ^


a4e2b0c15 ^

e25474154 ^

a4e2b0c15 ^


e25474154 ^


a4e2b0c15 ^

009730595 ^

a4e2b0c15 ^

009730595 ^

a4e2b0c15 ^

009730595 ^

a4e2b0c15 ^

e4515f304 ^

a4e2b0c15 ^


e4515f304 ^

a4e2b0c15 ^

427490a84 ^

a4e2b0c15 ^

427490a84 ^

d68181246 ^

5bf31fcab ^


674c05f42 ^

674c05f42 ^

d68181246 ^


e25474154 ^



5bf31fcab ^

e25474154 ^

1
2

3

4

5
6
7
8
9

10

11

12

13

14

15

16
17

18

19

20

21
22

23

24

25

26
27

28
29
30

31

32
33

34

35

36

37

38

39
40

41

42

43
44

45

46

47

48

49

50

51
52

53

54

55

56

57

58

59
60
61

62

63

64
65

66
67

68

69

70

71

72

73

74

75

76

77
78
79
80

81

82
83
84
85

86
87

88
89

90

91

92

93

94
95

96

97

98

99
100

101
102
103
104

105
106

107

108

109

110

111
112

113

114

115

116
117
118
119

120

121

122

123
124

125
126

127

128

129
130

131
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