- Expr = self._Expr[self._Idx:].replace('\\\\', '//').replace('\\\"', '\\\'')\r
- for Ch in Expr:\r
- self._Idx += 1\r
- if Ch == '"' or Ch == "'":\r
- break\r
- self._Token = self._LiteralToken = self._Expr[Idx:self._Idx]\r
- if self._Token.startswith('"') and not self._Token.endswith('"'):\r
- raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
- if self._Token.startswith("'") and not self._Token.endswith("'"):\r
- raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
+ if self._Expr[Idx] == '"':\r
+ Expr = self._Expr[self._Idx:].replace('\\\\', '//').replace('\\\"', '\\\'')\r
+ for Ch in Expr:\r
+ self._Idx += 1\r
+ if Ch == '"':\r
+ break\r
+ self._Token = self._LiteralToken = self._Expr[Idx:self._Idx]\r
+ if not self._Token.endswith('"'):\r
+ raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
+ #Replace escape \\\', \'\r
+ elif self._Expr[Idx] == "'":\r
+ Expr = self._Expr[self._Idx:].replace('\\\\', '//').replace("\\\'", "\\\"")\r
+ for Ch in Expr:\r
+ self._Idx += 1\r
+ if Ch == "'":\r
+ break\r
+ self._Token = self._LiteralToken = self._Expr[Idx:self._Idx]\r
+ if not self._Token.endswith("'"):\r
+ raise BadExpression(ERR_STRING_TOKEN % self._Token)\r