trading aint for isnt -- let's be serious

jashkenas · jashkenas · commit 7a2f5a333fe3 · 2009-12-24T17:21:20.000-08:00
diff --git a/documentation/cs/aliases.cs b/documentation/cs/aliases.cs
@@ -1,6 +1,6 @@
 launch() if ignition is on
 
-volume: 10 if band aint spinal_tap
+volume: 10 if band isnt spinal_tap
 
 let_the_wild_rumpus_begin() unless answer is no
 
diff --git a/documentation/index.html.erb b/documentation/index.html.erb
@@ -278,7 +278,7 @@ coffee-script --print app/scripts/*.cs > concatenation.js</pre>
       CoffeeScript compiles <tt>==</tt> into <tt>===</tt>, and <tt>!=</tt> into
       <tt>!==</tt>.
       In addition, <tt>is</tt> compiles into <tt>===</tt>,
-      and <tt>aint</tt> into <tt>!==</tt>.
+      and <tt>isnt</tt> into <tt>!==</tt>.
     </p>
     <p>
       You can use <tt>not</tt> as an alias for <tt>!</tt>.
diff --git a/examples/code.cs b/examples/code.cs
@@ -5,7 +5,7 @@
 
 odd: x => x % 2 is 0.
 
-even: x => x % 2 aint 0.
+even: x => x % 2 isnt 0.
 
 run_loop: =>
   fire_events( e => e.stopPropagation(). )
diff --git a/examples/underscore.cs b/examples/underscore.cs
@@ -49,7 +49,7 @@
     return iterator.call(context, item, i, obj) for item, i in obj. if _.isArray(obj) or _.isArguments(obj)
     iterator.call(context, obj[key], key, obj) for key in _.keys(obj).
   catch e
-    throw e if e aint breaker.
+    throw e if e isnt breaker.
   obj.
 
 # Return the results of applying the iterator to each element. Use JavaScript
diff --git a/index.html b/index.html
@@ -453,7 +453,7 @@ <h2>Language Reference</h2>
       CoffeeScript compiles <tt>==</tt> into <tt>===</tt>, and <tt>!=</tt> into
       <tt>!==</tt>.
       In addition, <tt>is</tt> compiles into <tt>===</tt>,
-      and <tt>aint</tt> into <tt>!==</tt>.
+      and <tt>isnt</tt> into <tt>!==</tt>.
     </p>
     <p>
       You can use <tt>not</tt> as an alias for <tt>!</tt>.
@@ -476,7 +476,7 @@ <h2>Language Reference</h2>
     </p>
     <div class='code'><pre class="idle">launch() <span class="Keyword">if</span> ignition <span class="Keyword">is</span> <span class="BuiltInConstant">on</span>
 
-volume<span class="Keyword">:</span> <span class="Number">10</span> <span class="Keyword">if</span> band <span class="Keyword">aint</span> spinal_tap
+volume<span class="Keyword">:</span> <span class="Number">10</span> <span class="Keyword">if</span> band isnt spinal_tap
 
 let_the_wild_rumpus_begin() <span class="Keyword">unless</span> answer <span class="Keyword">is</span> <span class="BuiltInConstant">no</span>
 
diff --git a/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage b/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage
@@ -241,7 +241,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|and|or|is|aint|not)\b</string>
+			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
 			<key>name</key>
 			<string>keyword.operator.cs</string>
 		</dict>
diff --git a/lib/coffee_script/grammar.y b/lib/coffee_script/grammar.y
@@ -24,7 +24,7 @@ prechigh
   left     '<<' '>>' '>>>'
   left     '&' '|' '^'
   left     '<=' '<' '>' '>='
-  right    '==' '!=' IS AINT
+  right    '==' '!=' IS ISNT
   left     '&&' '||' AND OR
   right    '-=' '+=' '/=' '*='
   right    DELETE INSTANCEOF TYPEOF
@@ -172,7 +172,7 @@ rule
   | Expression '==' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression '!=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression IS Expression          { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression AINT Expression        { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression ISNT Expression        { result = OpNode.new(val[1], val[0], val[2]) }
 
   | Expression '&&' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression '||' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
diff --git a/lib/coffee_script/lexer.rb b/lib/coffee_script/lexer.rb
@@ -8,7 +8,7 @@ class Lexer
     # The list of keywords passed verbatim to the parser.
     KEYWORDS   = ["if", "else", "then", "unless",
                   "true", "false", "yes", "no", "on", "off",
-                  "and", "or", "is", "aint", "not",
+                  "and", "or", "is", "isnt", "not",
                   "new", "return",
                   "try", "catch", "finally", "throw",
                   "break", "continue",
diff --git a/lib/coffee_script/nodes.rb b/lib/coffee_script/nodes.rb
@@ -357,7 +357,7 @@ class OpNode < Node
       'and'   => '&&',
       'or'    => '||',
       'is'    => '===',
-      "aint"  => "!==",
+      "isnt"  => "!==",
       'not'   => '!',
     }
     CONDITIONALS     = ['||:', '&&:']
diff --git a/lib/coffee_script/parser.rb b/lib/coffee_script/parser.rb
diff --git a/test/fixtures/each.cs b/test/fixtures/each.cs
@@ -10,5 +10,5 @@
     else
       iterator.call(context, obj[key], key, obj) for key in _.keys(obj)..
   catch e
-    throw e if e aint breaker.
+    throw e if e isnt breaker.
   obj.
diff --git a/test/fixtures/each.tokens b/test/fixtures/each.tokens
@@ -1 +1 @@
-[[:COMMENT, [" The cornerstone, an each implementation.", " Handles objects implementing forEach, arrays, and raw objects."]], ["\n", "\n"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "each"], [":", ":"], [:PARAM, "obj"], [",", ","], [:PARAM, "iterator"], [",", ","], [:PARAM, "context"], ["=>", "=>"], ["\n", "\n"], [:IDENTIFIER, "index"], [":", ":"], [:NUMBER, "0"], ["\n", "\n"], [:TRY, "try"], ["\n", "\n"], [:IF, "if"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["\n", "\n"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["(", "("], [:IDENTIFIER, "iterator"], [",", ","], [:IDENTIFIER, "context"], [")", ")"], ["\n", "\n"], [:ELSE, "else"], [:IF, "if"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArray"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [:OR, "or"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArguments"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [:IN, "in"], [:IDENTIFIER, "obj"], [".", "."], ["\n", "\n"], [:ELSE, "else"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "obj"], ["[", "["], [:IDENTIFIER, "key"], ["]", "]"], [",", ","], [:IDENTIFIER, "key"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "key"], [:IN, "in"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "keys"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [".", "."], [".", "."], ["\n", "\n"], [:CATCH, "catch"], [:IDENTIFIER, "e"], ["\n", "\n"], [:THROW, "throw"], [:IDENTIFIER, "e"], [:IF, "if"], [:IDENTIFIER, "e"], [:AINT, "aint"], [:IDENTIFIER, "breaker"], [".", "."], ["\n", "\n"], [:IDENTIFIER, "obj"], [".", "."]]
+[[:COMMENT, [" The cornerstone, an each implementation.", " Handles objects implementing forEach, arrays, and raw objects."]], ["\n", "\n"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "each"], [":", ":"], [:PARAM, "obj"], [",", ","], [:PARAM, "iterator"], [",", ","], [:PARAM, "context"], ["=>", "=>"], ["\n", "\n"], [:IDENTIFIER, "index"], [":", ":"], [:NUMBER, "0"], ["\n", "\n"], [:TRY, "try"], ["\n", "\n"], [:IF, "if"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["\n", "\n"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["(", "("], [:IDENTIFIER, "iterator"], [",", ","], [:IDENTIFIER, "context"], [")", ")"], ["\n", "\n"], [:ELSE, "else"], [:IF, "if"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArray"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [:OR, "or"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArguments"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [:IN, "in"], [:IDENTIFIER, "obj"], [".", "."], ["\n", "\n"], [:ELSE, "else"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "obj"], ["[", "["], [:IDENTIFIER, "key"], ["]", "]"], [",", ","], [:IDENTIFIER, "key"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "key"], [:IN, "in"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "keys"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [".", "."], [".", "."], ["\n", "\n"], [:CATCH, "catch"], [:IDENTIFIER, "e"], ["\n", "\n"], [:THROW, "throw"], [:IDENTIFIER, "e"], [:IF, "if"], [:IDENTIFIER, "e"], [:ISNT, "isnt"], [:IDENTIFIER, "breaker"], [".", "."], ["\n", "\n"], [:IDENTIFIER, "obj"], [".", "."]]
diff --git a/test/fixtures/execution/array_comprehension.cs b/test/fixtures/execution/array_comprehension.cs
@@ -1,4 +1,4 @@
-nums: n * n for n in [1, 2, 3] if n % 2 aint 0.
+nums: n * n for n in [1, 2, 3] if n % 2 isnt 0.
 result: n * 2 for n in nums.
 
 print(result.join(',') is '2,18')

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ class OpNode < Node`
`357`	`357`	`'and' => '&&',`
`358`	`358`	`'or' => '\|\|',`
`359`	`359`	`'is' => '===',`
`360`		`- "aint" => "!==",`
	`360`	`+ "isnt" => "!==",`
`361`	`361`	`'not' => '!',`
`362`	`362`	`}`
`363`	`363`	`CONDITIONALS = ['\|\|:', '&&:']`