Merge pull request #660 from sethkinast/char-reserved

Grammar: s/char/character/ to avoid using a reserved name Closes #659
linkedin · May 7, 2015 · aa019e0 · aa019e0
2 parents 162006a + dd6266f
commit aa019e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -187,7 +187,7 @@
  peg$c99 = { type: "literal", value: "{`", description: "\"{`\"" },
  peg$c100 = "`}",
  peg$c101 = { type: "literal", value: "`}", description: "\"`}\"" },
- peg$c102 = function(char) {return char},
+ peg$c102 = function(character) {return character},
  peg$c103 = function(rawText) { return withPosition(["raw", rawText.join('')]) },
  peg$c104 = { type: "other", description: "comment" },
  peg$c105 = "{!",

diff --git a/src/dust.pegjs b/src/dust.pegjs
@@ -217,7 +217,7 @@ esc
  = '\\"' { return '"' }
 
 raw "raw"
- = "{`" rawText:(!"`}" char:. {return char})* "`}"
+ = "{`" rawText:(!"`}" character:. {return character})* "`}"
  { return withPosition(["raw", rawText.join('')]) }
 comment "comment"
  = "{!" c:(!"!}" c:. {return c})* "!}"