From fd8c6d0a32d616c7080ba8161d1acd0f2fb74468 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 10 Apr 2015 16:12:54 +0300 Subject: Fix deprecation warnings in re --- lib/impure/re.nim | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/impure/re.nim') diff --git a/lib/impure/re.nim b/lib/impure/re.nim index 91381bda3..e6fc93c7a 100644 --- a/lib/impure/re.nim +++ b/lib/impure/re.nim @@ -41,11 +41,11 @@ type reExtended = 3, ## ignore whitespace and ``#`` comments reStudy = 4 ## study the expression (may be omitted if the ## expression will be used only once) - - RegexDesc = object - h: PPcre - e: ptr TExtra - + + RegexDesc = object + h: ptr Pcre + e: ptr ExtraData + Regex* = ref RegexDesc ## a compiled regular expression RegexError* = object of ValueError @@ -60,7 +60,7 @@ proc raiseInvalidRegex(msg: string) {.noinline, noreturn.} = e.msg = msg raise e -proc rawCompile(pattern: string, flags: cint): PPcre = +proc rawCompile(pattern: string, flags: cint): ptr Pcre = var msg: cstring offset: cint @@ -84,7 +84,7 @@ proc re*(s: string, flags = {reExtended, reStudy}): Regex = result.h = rawCompile(s, cast[cint](flags - {reStudy})) if reStudy in flags: var msg: cstring - result.e = pcre.study(result.h, 0, msg) + result.e = pcre.study(result.h, 0, addr msg) if not isNil(msg): raiseInvalidRegex($msg) proc matchOrFind(s: string, pattern: Regex, matches: var openArray[string], -- cgit 1.4.1-2-gfad0 m?h=devel&id=f9d4e39a12238d48cd7b8ab461055fe48b989967'>commit diff stats
path: root/compiler/nimsets.nim
blob: 118046283cc873b5d9da2a6170d184d122b9b692 (plain) (tree) 
e25474154 ^



4f1b89c30 ^

e25474154 ^








36c67455d ^

e25474154 ^




















674c05f42 ^



e25474154 ^










02b1503e1 ^



d5a5c2291 ^

e25474154 ^

d5a5c2291 ^

674c05f42 ^

e25474154 ^

674c05f42 ^


e25474154 ^

674c05f42 ^

e25474154 ^




674c05f42 ^



e25474154 ^









































































































674c05f42 ^



e25474154 ^







36c67455d ^

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
160
161
162
163
164
165
166
167
168
169
170

171
172
173

174
175
176
177
178
179
180

181