Merge branch 'master' into patch

Author: MikeInnes

.gitignore

@@ -1,2 +1,18 @@
 *.jl.cov
+*.jl.*.cov
 *.jl.mem
+
+.DS_Store
+
+docs/build/
+docs/site/
+
+docs/Manifest.toml
+
+*.ipynb_checkpoints
+**/*.ipynb_checkpoints
+**/**/*.ipynb_checkpoints
+
+_*.dat
+*.swp
+__pycache__/

.travis.yml

@@ -4,13 +4,28 @@ os:
   - osx
 julia:
   - 0.6
+  - 1.0
   - nightly
 matrix:
     allow_failures:
     - julia: nightly
 notifications:
   email: false
-# uncomment the following lines to override the default test script
-#script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.build("MacroTools"); Pkg.test("MacroTools"; coverage=true)'
+
+env:
+  global:
+    - DOCUMENTER_DEBUG=true
+
+jobs:
+  include:
+    - stage: "Documentation"
+      julia: 1.0
+      os: linux
+      script:
+        - julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()))'
+        - julia --project=docs/ docs/make.jl
+      after_success: skip
+
+# uncomment this to enable test coverage
+# after_success:
+#   - julia -e 'import Pkg; cd(Pkg.dir("Luxor")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

Manifest.toml

@@ -0,0 +1,94 @@
+# This file is machine-generated - editing it directly is not advised
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[Compat]]
+deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
+git-tree-sha1 = "49269e311ffe11ac5b334681d212329002a9832a"
+uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
+version = "1.5.1"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[DelimitedFiles]]
+deps = ["Mmap"]
+uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+
+[[Distributed]]
+deps = ["Random", "Serialization", "Sockets"]
+uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[LibGit2]]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[LinearAlgebra]]
+deps = ["Libdl"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[SharedArrays]]
+deps = ["Distributed", "Mmap", "Random", "Serialization"]
+uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
+[[Test]]
+deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

Project.toml

@@ -0,0 +1,5 @@
+name = "MacroTools"
+uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+
+[deps]
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

README.md

@@ -13,7 +13,7 @@ have a type definition:
 
 ```julia
 ex = quote
-  type Foo
+  struct Foo
     x::Int
     y
   end
@@ -23,7 +23,7 @@ end
 If you know what you're doing, you can pull out the name and fields via:
 
 ```julia
-julia> if isexpr(ex.args[2], :type)
+julia> if isexpr(ex.args[2], :struct)
          (ex.args[2].args[2], ex.args[2].args[3].args)
        end
 (:Foo,{:( # line 3:),:(x::Int),:( # line 4:),:y})
@@ -40,7 +40,7 @@ Enter MacroTools:
 ```julia
 julia> using MacroTools
 
-julia> @capture(ex, type T_ fields__ end)
+julia> @capture(ex, struct T_ fields__ end)
 true
 
 julia> T, fields
@@ -91,12 +91,12 @@ Another common use case is to catch symbol literals, e.g.
 
 ```julia
 @capture(ex,
-  type T_Symbol
+  struct T_Symbol
     fields__
   end)
 ```
 
-which will match e.g. `type Foo ...` but not `type Foo{V} ...`
+which will match e.g. `struct Foo ...` but not `struct Foo{V} ...`
 
 ### Unions
 

docs/Project.toml

@@ -0,0 +1,6 @@
+[deps]
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+
+[compat]
+Documenter = "~0.19"

docs/make.jl

@@ -0,0 +1,22 @@
+using Documenter, MacroTools
+
+makedocs(
+    modules = [MacroTools],
+    format  = :html,
+    sitename = "MacroTools",
+    pages = Any[
+        "Introduction to MacroTools"   => "index.md"
+    ],
+    # Use clean URLs, unless built as a "local" build
+    html_prettyurls = !("local" in ARGS),
+    # html_canonical = "https://juliadocs.github.io/Documenter.jl/latest/",
+)
+
+deploydocs(
+    repo = "[email protected]:MikeInnes/MacroTools.jl.git",
+    target = "build",
+    julia = "1.0",
+    osname = "linux",
+    deps = nothing,
+    make = nothing,
+)