@@ -55,19 +55,19 @@ defmodule Xlsxir.ParseWorksheet do
5555 end
5656
5757 def sax_event_handler (
58- { :startElement , _ , ' row' , _ , _ } ,
58+ { :startElement , _ , ~c " row" , _ , _ } ,
5959 % __MODULE__ { tid: tid , max_rows: max_rows } ,
6060 _excel ,
6161 _
6262 ) do
6363 % __MODULE__ { tid: tid , max_rows: max_rows }
6464 end
6565
66- def sax_event_handler ( { :startElement , _ , 'c' , _ , xml_attr } , state , % { styles: styles_tid } , _ ) do
66+ def sax_event_handler ( { :startElement , _ , ~c " c " , _ , xml_attr } , state , % { styles: styles_tid } , _ ) do
6767 a =
6868 Enum . reduce ( xml_attr , % { } , fn attr , acc ->
6969 case attr do
70- { :attribute , 's' , _ , _ , style } ->
70+ { :attribute , ~c " s " , _ , _ , style } ->
7171 Map . put ( acc , "s" , find_styles ( styles_tid , List . to_integer ( style ) ) )
7272
7373 { :attribute , key , _ , _ , ref } ->
@@ -80,19 +80,20 @@ defmodule Xlsxir.ParseWorksheet do
8080 % { state | cell_ref: cell_ref , num_style: num_style , data_type: data_type }
8181 end
8282
83- def sax_event_handler ( { :startElement , _ , 'f' , _ , _ } , state , _ , _ ) do
83+ def sax_event_handler ( { :startElement , _ , ~c " f " , _ , _ } , state , _ , _ ) do
8484 % { state | value_type: :formula }
8585 end
8686
87- def sax_event_handler ( { :startElement , _ , el , _ , _ } , state , _ , _ ) when el in [ 'v' , 't' ] do
87+ def sax_event_handler ( { :startElement , _ , el , _ , _ } , state , _ , _ ) when el in [ ~c " v " , ~c " t " ] do
8888 % { state | value_type: :value }
8989 end
9090
91- def sax_event_handler ( { :endElement , _ , el , _ , _ } , state , _ , _ ) when el in [ 'f' , 'v' , 't' ] do
91+ def sax_event_handler ( { :endElement , _ , el , _ , _ } , state , _ , _ )
92+ when el in [ ~c" f" , ~c" v" , ~c" t" ] do
9293 % { state | value_type: nil }
9394 end
9495
95- def sax_event_handler ( { :startElement , _ , 'is' , _ , _ } , state , _ , _ ) ,
96+ def sax_event_handler ( { :startElement , _ , ~c " is " , _ , _ } , state , _ , _ ) ,
9697 do: % { state | value_type: :value }
9798
9899 def sax_event_handler ( { :characters , value } , state , _ , _ ) do
@@ -103,7 +104,7 @@ defmodule Xlsxir.ParseWorksheet do
103104 end
104105 end
105106
106- def sax_event_handler ( { :endElement , _ , 'c' , _ } , % __MODULE__ { row: row } = state , excel , _ ) do
107+ def sax_event_handler ( { :endElement , _ , ~c " c " , _ } , % __MODULE__ { row: row } = state , excel , _ ) do
107108 cell_value = format_cell_value ( excel , [ state . data_type , state . num_style , state . value ] )
108109 new_cell = [ to_string ( state . cell_ref ) , cell_value ]
109110
@@ -118,7 +119,7 @@ defmodule Xlsxir.ParseWorksheet do
118119 end
119120
120121 def sax_event_handler (
121- { :endElement , _ , ' row' , _ } ,
122+ { :endElement , _ , ~c " row" , _ } ,
122123 % __MODULE__ { tid: tid , max_rows: max_rows } = state ,
123124 _excel ,
124125 _
@@ -180,7 +181,7 @@ defmodule Xlsxir.ParseWorksheet do
180181 acc + char - 65 + 1
181182 end )
182183
183- "#{ column_from_index ( col_index + 1 , '' ) } #{ line } "
184+ "#{ column_from_index ( col_index + 1 , ~c " " ) } #{ line } "
184185 end
185186
186187 def fill_empty_cells ( from , from , _line , cells ) , do: Enum . reverse ( cells )
@@ -202,22 +203,22 @@ defmodule Xlsxir.ParseWorksheet do
202203 # Empty cell with assigned attribute
203204 [ _ , _ , "" ] -> nil
204205 # Type error
205- [ 'e' , _ , e ] -> List . to_string ( e )
206+ [ ~c " e " , _ , e ] -> List . to_string ( e )
206207 # Type string
207- [ 's' , _ , i ] -> find_string ( strings_tid , List . to_integer ( i ) )
208+ [ ~c " s " , _ , i ] -> find_string ( strings_tid , List . to_integer ( i ) )
208209 # Type number
209210 [ nil , nil , n ] -> convert_char_number ( n )
210- [ 'n' , nil , n ] -> convert_char_number ( n )
211+ [ ~c " n " , nil , n ] -> convert_char_number ( n )
211212 # ISO 8601 type date
212- [ nil , 'd' , d ] -> convert_date_or_time ( d )
213- [ 'n' , 'd' , d ] -> convert_date_or_time ( d )
214- [ 'd' , 'd' , d ] -> convert_iso_date ( d )
213+ [ nil , ~c " d " , d ] -> convert_date_or_time ( d )
214+ [ ~c " n " , ~c " d " , d ] -> convert_date_or_time ( d )
215+ [ ~c " d " , ~c " d " , d ] -> convert_iso_date ( d )
215216 # Type formula w/ string
216- [ ' str' , _ , s ] -> List . to_string ( s )
217+ [ ~c " str" , _ , s ] -> List . to_string ( s )
217218 # Type boolean
218- [ 'b' , _ , s ] -> s == '1'
219+ [ ~c " b " , _ , s ] -> s == ~c " 1 "
219220 # Type string
220- [ ' inlineStr' , _ , s ] -> List . to_string ( s )
221+ [ ~c " inlineStr" , _ , s ] -> List . to_string ( s )
221222 # Unmapped type
222223 _ -> raise "Unmapped attribute #{ Enum . at ( list , 0 ) } . Unable to process"
223224 end
0 commit comments