Merge branch 'jn/gensym2'

Conflicts: src/julia-syntax.scm
tekverkp · Jan 30, 2015 · a0266d4 · a0266d4
2 parents 2bf7446 + d0fa2db
commit a0266d4
Show file tree

Hide file tree

Showing 25 changed files with 4,388 additions and 3,992 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,5 +18,6 @@
 *.dSYM
 *.jl.cov
 *.jl.mem
+*.ji
 
 .DS_Store
diff --git a/base/base.jl b/base/base.jl
@@ -31,6 +31,7 @@ call(T::Type{NewvarNode}, s::Symbol) = Core.call(T, s)
 call(T::Type{TopNode}, s::Symbol) = Core.call(T, s)
 call(T::Type{Module}, args...) = Core.call(T, args...)
 call(T::Type{Task}, f::ANY) = Core.call(T, f)
+call(T::Type{GenSym}, n::Int) = Core.call(T, n)
 
 call{T}(::Type{T}, args...) = convert(T, args...)::T
 

diff --git a/base/boot.jl b/base/boot.jl
@@ -122,7 +122,7 @@ export
  AbstractArray, DenseArray,
  # special objects
  Box, Function, IntrinsicFunction, LambdaStaticData, Method, MethodTable,
- Module, Symbol, Task, Array,
+ Module, Symbol, Task, Array, GenSym,
  # numeric types
  Bool, FloatingPoint, Float16, Float32, Float64, Number, Integer, Int, Int8, Int16,
  Int32, Int64, Int128, Ptr, Real, Signed, UInt, UInt8, UInt16, UInt32,
@@ -274,6 +274,7 @@ _new(:GotoNode, :Int)
 _new(:TopNode, :Symbol)
 _new(:NewvarNode, :Symbol)
 _new(:QuoteNode, :ANY)
+_new(:GenSym, :Int)
 
 Module(name::Symbol) = ccall(:jl_f_new_module, Any, (Any,), name)::Module
 Module() = Module(:anonymous)

diff --git a/base/expr.jl b/base/expr.jl
@@ -14,6 +14,8 @@ gensym(s::UTF8String) = gensym(s.data)
 gensym(a::Array{UInt8,1}) =
  ccall(:jl_tagged_gensym, Any, (Ptr{UInt8}, Int32), a, length(a))::Symbol
 gensym(ss::Union(ASCIIString, UTF8String)...) = map(gensym, ss)
+gensym(s::Symbol) =
+ ccall(:jl_tagged_gensym, Any, (Ptr{UInt8}, Int32), s, ccall(:strlen, Csize_t, (Ptr{UInt8},), s))::Symbol
 
 macro gensym(names...)
  blk = Expr(:block)