From d6fbfa55b6380b8c0cfba3710fa3738ed7a33fe0 Mon Sep 17 00:00:00 2001 From: Michael Ficarra Date: Thu, 8 Mar 2012 14:44:47 -0500 Subject: [PATCH] number literal error messages: more consistent, removed pluralisation --- lib/coffee-script/lexer.js | 6 +++--- src/lexer.coffee | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js index 3caaab52..6acb5045 100644 --- a/lib/coffee-script/lexer.js +++ b/lib/coffee-script/lexer.js @@ -115,11 +115,11 @@ if (/E/.test(number)) { this.error("exponential notation '" + number + "' must be indicated with a lowercase 'e'"); } else if (/[BOX]/.test(number)) { - this.error("radix prefixes must be lowercase '" + number + "'"); + this.error("radix prefix '" + number + "' must be lowercase"); } else if (/^0[89]/.test(number)) { - this.error("decimal literals '" + number + "' must not be prefixed with '0'"); + this.error("decimal literal '" + number + "' must not be prefixed with '0'"); } else if (/^0[0-7]/.test(number)) { - this.error("octal literals '" + number + "' must be prefixed with '0o'"); + this.error("octal literal '" + number + "' must be prefixed with '0o'"); } lexedLength = number.length; if (octalLiteral = /0o([0-7]+)/.exec(number)) { diff --git a/src/lexer.coffee b/src/lexer.coffee index 55a4821f..50f9802b 100644 --- a/src/lexer.coffee +++ b/src/lexer.coffee @@ -136,11 +136,11 @@ exports.Lexer = class Lexer if /E/.test number @error "exponential notation '#{number}' must be indicated with a lowercase 'e'" else if /[BOX]/.test number - @error "radix prefixes must be lowercase '#{number}'" + @error "radix prefix '#{number}' must be lowercase" else if /^0[89]/.test number - @error "decimal literals '#{number}' must not be prefixed with '0'" + @error "decimal literal '#{number}' must not be prefixed with '0'" else if /^0[0-7]/.test number - @error "octal literals '#{number}' must be prefixed with '0o'" + @error "octal literal '#{number}' must be prefixed with '0o'" lexedLength = number.length if octalLiteral = /0o([0-7]+)/.exec number number = (parseInt octalLiteral[1], 8).toString()