@@ -71,7 +71,7 @@ def get_key_string(data, section, key) # :nodoc:
71
71
end
72
72
end
73
73
74
- private
74
+ private
75
75
76
76
def parse_config_lines ( io )
77
77
section = 'default'
@@ -110,10 +110,10 @@ def parse_config_lines(io)
110
110
QUOTE_REGEXP_DQ = /\A ([^"\\ ]*(?:""[^"\\ ]*|\\ .[^"\\ ]*)*)"/
111
111
# escaped char map
112
112
ESCAPE_MAP = {
113
- "r" => "\r " ,
114
- "n" => "\n " ,
115
- "b" => "\b " ,
116
- "t" => "\t " ,
113
+ "r" => "\r " ,
114
+ "n" => "\n " ,
115
+ "b" => "\b " ,
116
+ "t" => "\t " ,
117
117
}
118
118
119
119
def unescape_value ( data , section , value )
@@ -123,36 +123,36 @@ def unescape_value(data, section, value)
123
123
c = m [ 0 ]
124
124
value = m . post_match
125
125
case c
126
- when "'"
127
- if m = value . match ( QUOTE_REGEXP_SQ )
128
- scanned << m [ 1 ] . gsub ( /\\ (.)/ , '\\1' )
129
- value = m . post_match
130
- else
131
- break
132
- end
133
- when '"'
134
- if m = value . match ( QUOTE_REGEXP_DQ )
135
- scanned << m [ 1 ] . gsub ( /""/ , '' ) . gsub ( /\\ (.)/ , '\\1' )
136
- value = m . post_match
137
- else
138
- break
139
- end
140
- when "\\ "
141
- c = value . slice! ( 0 , 1 )
142
- scanned << ( ESCAPE_MAP [ c ] || c )
143
- when "$"
144
- ref , value = extract_reference ( value )
145
- refsec = section
146
- if ref . index ( '::' )
147
- refsec , ref = ref . split ( '::' , 2 )
148
- end
149
- if v = get_key_string ( data , refsec , ref )
150
- scanned << v
126
+ when "'"
127
+ if m = value . match ( QUOTE_REGEXP_SQ )
128
+ scanned << m [ 1 ] . gsub ( /\\ (.)/ , '\\1' )
129
+ value = m . post_match
130
+ else
131
+ break
132
+ end
133
+ when '"'
134
+ if m = value . match ( QUOTE_REGEXP_DQ )
135
+ scanned << m [ 1 ] . gsub ( /""/ , '' ) . gsub ( /\\ (.)/ , '\\1' )
136
+ value = m . post_match
137
+ else
138
+ break
139
+ end
140
+ when "\\ "
141
+ c = value . slice! ( 0 , 1 )
142
+ scanned << ( ESCAPE_MAP [ c ] || c )
143
+ when "$"
144
+ ref , value = extract_reference ( value )
145
+ refsec = section
146
+ if ref . index ( '::' )
147
+ refsec , ref = ref . split ( '::' , 2 )
148
+ end
149
+ if v = get_key_string ( data , refsec , ref )
150
+ scanned << v
151
+ else
152
+ raise ConfigError , "variable has no value"
153
+ end
151
154
else
152
- raise ConfigError , "variable has no value"
153
- end
154
- else
155
- raise 'must not reaced'
155
+ raise 'must not reaced'
156
156
end
157
157
end
158
158
scanned << value
@@ -186,25 +186,25 @@ def clear_comments(line)
186
186
c = m [ 0 ]
187
187
line = m . post_match
188
188
case c
189
- when '#'
190
- line = nil
191
- break
192
- when "'" , '"'
193
- regexp = ( c == "'" ) ? QUOTE_REGEXP_SQ : QUOTE_REGEXP_DQ
194
- scanned << c
195
- if m = line . match ( regexp )
196
- scanned << m [ 0 ]
197
- line = m . post_match
198
- else
199
- scanned << line
189
+ when '#'
200
190
line = nil
201
191
break
202
- end
203
- when "\\ "
204
- scanned << c
205
- scanned << line . slice! ( 0 , 1 )
206
- else
207
- raise 'must not reaced'
192
+ when "'" , '"'
193
+ regexp = ( c == "'" ) ? QUOTE_REGEXP_SQ : QUOTE_REGEXP_DQ
194
+ scanned << c
195
+ if m = line . match ( regexp )
196
+ scanned << m [ 0 ]
197
+ line = m . post_match
198
+ else
199
+ scanned << line
200
+ line = nil
201
+ break
202
+ end
203
+ when "\\ "
204
+ scanned << c
205
+ scanned << line . slice! ( 0 , 1 )
206
+ else
207
+ raise 'must not reaced'
208
208
end
209
209
end
210
210
scanned << line
@@ -450,13 +450,13 @@ def inspect
450
450
"#<#{ self . class . name } sections=#{ sections . inspect } >"
451
451
end
452
452
453
- protected
453
+ protected
454
454
455
455
def data # :nodoc:
456
456
@data
457
457
end
458
458
459
- private
459
+ private
460
460
461
461
def initialize_copy ( other )
462
462
@data = other . data . dup
0 commit comments