crystal-lang · Jul 4, 2016 · Jul 4, 2016 · Jul 4, 2016 · Jul 4, 2016
Showing with 30 additions and 24 deletions.

+4 −4 Makefile

+1 −1 bin/ci

+5 −2 spec/std/file_spec.cr

+0 −4 spec/std/io/buffered_spec.cr

+1 −1 src/file.cr

+9 −2 src/io/file_descriptor.cr

+10 −10 src/regex.cr
diff --git a/Makefile b/Makefile
@@ -59,19 +59,19 @@ deps: llvm_ext libcrystal
 
 $(O)/all_spec: deps $(SOURCES) $(SPEC_SOURCES)
 	@mkdir -p $(O)
-	$(BUILD_PATH) ./bin/crystal compile $(FLAGS) -o $@ spec/all_spec.cr
+	$(BUILD_PATH) ./bin/crystal build $(FLAGS) -o $@ spec/all_spec.cr
 
 $(O)/std_spec: deps $(SOURCES) $(SPEC_SOURCES)
 	@mkdir -p $(O)
-	$(BUILD_PATH) ./bin/crystal compile $(FLAGS) -o $@ spec/std_spec.cr
+	$(BUILD_PATH) ./bin/crystal build $(FLAGS) -o $@ spec/std_spec.cr
 
 $(O)/compiler_spec: deps $(SOURCES) $(SPEC_SOURCES)
 	@mkdir -p $(O)
-	$(BUILD_PATH) ./bin/crystal compile $(FLAGS) -o $@ spec/compiler_spec.cr
+	$(BUILD_PATH) ./bin/crystal build $(FLAGS) -o $@ spec/compiler_spec.cr
 
 $(O)/crystal: deps $(SOURCES)
 	@mkdir -p $(O)
-	$(BUILD_PATH) $(EXPORTS) ./bin/crystal compile $(FLAGS) -o $@ src/compiler/crystal.cr -D without_openssl -D without_zlib
+	$(BUILD_PATH) $(EXPORTS) ./bin/crystal build $(FLAGS) -o $@ src/compiler/crystal.cr -D without_openssl -D without_zlib
 
 $(LLVM_EXT_OBJ): $(LLVM_EXT_DIR)/llvm_ext.cc
 	$(CXX) -c -o $@ $< `$(LLVM_CONFIG) --cxxflags`

diff --git a/bin/ci b/bin/ci
@@ -85,7 +85,7 @@ prepare_system() {
 build() {
   with_build_env 'make std_spec clean'
   with_build_env 'make crystal std_spec compiler_spec doc'
-  with_build_env 'find samples -name "*.cr" | xargs -L 1 ./bin/crystal compile --no-codegen'
+  with_build_env 'find samples -name "*.cr" | xargs -L 1 ./bin/crystal build --no-codegen'
   with_build_env './bin/crystal tool format --check'
 }
 

diff --git a/spec/std/file_spec.cr b/spec/std/file_spec.cr
@@ -410,7 +410,9 @@ describe "File" do
   end
 
   it "does to_s" do
-    File.new(__FILE__).to_s.should eq("#<File:#{__FILE__}>")
+    file = File.new(__FILE__)
+    file.to_s.should eq("#<File:0x#{file.object_id.to_s(16)}>")
+    File.new(__FILE__).inspect.should eq("#<File:#{__FILE__}>")
   end
 
   describe "close" do
@@ -434,7 +436,8 @@ describe "File" do
     it "does to_s when closed" do
       file = File.new(__FILE__)
       file.close
-      file.to_s.should eq("#<File:#{__FILE__} (closed)>")
+      file.to_s.should eq("#<File:0x#{file.object_id.to_s(16)}>")
+      file.inspect.should eq("#<File:#{__FILE__} (closed)>")
     end
   end
 

diff --git a/spec/std/io/buffered_spec.cr b/spec/std/io/buffered_spec.cr
@@ -44,10 +44,6 @@ class IO::BufferedWrapper
     @io.closed?
   end
 
-  def to_fd_io
-    @io.to_fd_io
-  end
-
   private def unbuffered_rewind
     @io.rewind
   end

diff --git a/src/file.cr b/src/file.cr
@@ -516,7 +516,7 @@ class File < IO::FileDescriptor
     code
   end
 
-  def to_s(io)
+  def inspect(io)
     io << "#<File:" << @path
     io << " (closed)" if closed?
     io << ">"

diff --git a/src/io/file_descriptor.cr b/src/io/file_descriptor.cr
@@ -202,8 +202,15 @@ class IO::FileDescriptor
     other
   end
 
-  def to_fd_io
-    self
+  def inspect(io)
+    io << "#<IO::FileDescriptor:"
+    if closed?
+      io << "(closed)"
+    else
+      io << " fd=" << @fd
+    end
+    io << ">"
+    io
   end
 
   private def unbuffered_read(slice : Slice(UInt8))

diff --git a/src/regex.cr b/src/regex.cr
@@ -101,10 +101,10 @@ require "./regex/*"
 # each capture group can be extracted on a successful match:
 #
 # ```
-# /a(sd)f/.match("_asdf_")                       # => #<Regex::MatchData "asdf" 1:"sd">
-# /a(sd)f/.match("_asdf_").not_nil![1]           # => "sd"
-# /a(?<grp>sd)f/.match("_asdf_")                 # => #<Regex::MatchData "asdf" grp:"sd">
-# /a(?<grp>sd)f/.match("_asdf_").not_nil!["grp"] # => "sd"
+# /a(sd)f/.match("_asdf_")                     # => #<Regex::MatchData "asdf" 1:"sd">
+# /a(sd)f/.match("_asdf_").try &.[1]           # => "sd"
+# /a(?<grp>sd)f/.match("_asdf_")               # => #<Regex::MatchData "asdf" grp:"sd">
+# /a(?<grp>sd)f/.match("_asdf_").try &.["grp"] # => "sd"
 # ```
 #
 # Capture groups are indexed starting from 1. Methods that accept a capture
@@ -405,9 +405,9 @@ class Regex
   # `nil`. `$~` will contain the same value that was returned.
   #
   # ```
-  # /(.)(.)(.)/.match("abc").not_nil![2]   # => "b"
-  # /(.)(.)/.match("abc", 1).not_nil![2]   # => "c"
-  # /(.)(.)/.match("クリスタル", 3).not_nil![2] # => "ル"
+  # /(.)(.)(.)/.match("abc").try &.[2]   # => "b"
+  # /(.)(.)/.match("abc", 1).try &.[2]   # => "c"
+  # /(.)(.)/.match("クリスタル", 3).try &.[2] # => "ル"
   # ```
   def match(str, pos = 0, options = Regex::Options::None) : MatchData?
     if byte_index = str.char_index_to_byte_index(pos)
@@ -425,9 +425,9 @@ class Regex
   # `nil`. `$~` will contain the same value that was returned.
   #
   # ```
-  # /(.)(.)(.)/.match_at_byte_index("abc").not_nil![2]   # => "b"
-  # /(.)(.)/.match_at_byte_index("abc", 1).not_nil![2]   # => "c"
-  # /(.)(.)/.match_at_byte_index("クリスタル", 3).not_nil![2] # => "ス"
+  # /(.)(.)(.)/.match_at_byte_index("abc").try &.[2]   # => "b"
+  # /(.)(.)/.match_at_byte_index("abc", 1).try &.[2]   # => "c"
+  # /(.)(.)/.match_at_byte_index("クリスタル", 3).try &.[2] # => "ス"
   # ```
   def match_at_byte_index(str, byte_index = 0, options = Regex::Options::None) : MatchData?
     return ($~ = nil) if byte_index > str.bytesize