lib/ruote/reader/radial.rb in ruote-2.3.0.1 vs lib/ruote/reader/radial.rb in ruote-2.3.0.2

- old
+ new

@@ -1,7 +1,7 @@ #-- -# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -61,19 +61,19 @@ ).as(:number) >> match('[ \n,]').present? } rule(:string) { str('"') >> ( - str('\\') >> any | str('"').absent? >> any + str('\\') >> any | match('[^"]') ).repeat.as(:string) >> str('"') | str("'") >> ( - str('\\') >> any | str("'").absent? >> any + str('\\') >> any | match("[^']") ).repeat.as(:string) >> str("'") } rule(:regex) { str('/') >> ( - str('\\') >> any | str('/').absent? >> any + str('\\') >> any | match("[^\/]") ).repeat.as(:regex) >> str('/') } rule(:array) { str('[') >> spaces? >>