crystal-lang · Jun 6, 2016 · Jun 6, 2016
Showing with 18 additions and 5 deletions.

+2 −0 spec/compiler/parser/parser_spec.cr

+7 −0 spec/compiler/type_inference/pointer_spec.cr

+2 −0 src/compiler/crystal/semantic/main_visitor.cr

+2 −0 src/compiler/crystal/syntax/lexer.cr

+5 −5 src/xml/xml.cr
diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
@@ -1322,6 +1322,8 @@ describe "Parser" do
   assert_syntax_error "{foo: 1\nbar: 2}"
   assert_syntax_error "{foo: 1, bar: 2\nbaz: 3}"
 
+  assert_syntax_error "'''", "invalid empty char literal"
+
   describe "end locations" do
     assert_end_location "nil"
     assert_end_location "false"

diff --git a/spec/compiler/type_inference/pointer_spec.cr b/spec/compiler/type_inference/pointer_spec.cr
@@ -162,4 +162,11 @@ describe "Type inference: pointer" do
       LibFoo.foo(Foo.new)
       )) { float64 }
   end
+
+  it "errors if doing Pointer.allocate" do
+    assert_error %(
+      Pointer(Int32).allocate
+      ),
+      "can't create instance of a pointer type"
+  end
 end
diff --git a/src/compiler/crystal/semantic/main_visitor.cr b/src/compiler/crystal/semantic/main_visitor.cr
@@ -2015,6 +2015,8 @@ module Crystal
         node.raise "can't create instance of generic class #{instance_type} without specifying its type vars"
       when UnionType
         node.raise "can't create instance of a union type"
+      when PointerInstanceType
+        node.raise "can't create instance of a pointer type"
       end
 
       if !instance_type.virtual? && instance_type.abstract?

diff --git a/src/compiler/crystal/syntax/lexer.cr b/src/compiler/crystal/syntax/lexer.cr
@@ -572,6 +572,8 @@ module Crystal
           else
             @token.value = char2
           end
+        when '\''
+          raise "invalid empty char literal (did you mean '\\\''?)", line, column
         when '\0'
           raise "unterminated char literal", line, column
         else

diff --git a/src/xml/xml.cr b/src/xml/xml.cr
@@ -28,11 +28,11 @@
 # ```
 module XML
   SUBSTITUTIONS = {
-    '>' => "&gt;",
-    '<' => "&lt;",
-    '"' => "&quot;",
-    ''' => "&apos;",
-    '&' => "&amp;",
+    '>'  => "&gt;",
+    '<'  => "&lt;",
+    '"'  => "&quot;",
+    '\'' => "&apos;",
+    '&'  => "&amp;",
   }
 
   def self.escape(string : String)