remove operators: <- &> &>> &< &<<

add operators: <| |> closes #3270
JuliaLang · Jun 5, 2013 · 7203173 · 7203173
1 parent 627d1cc
commit 7203173
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/base/exports.jl b/base/exports.jl
@@ -223,10 +223,6 @@ export
     #.>>,
     #.<<,
     >>>,
-    #&>,
-    #&>>,
-    #&<,
-    #&<<,
     \,
     ^,
     |,

diff --git a/base/operators.jl b/base/operators.jl
@@ -234,7 +234,7 @@ macro vectorize_2arg(S,f)
 end
 
 # some operators not defined yet
-global //, .>>, .<<, &>, &>>, &<, &<<
+global //, .>>, .<<, >:, <|, |>
 
 module Operators
 
@@ -264,6 +264,7 @@ export
     //,
     <,
     <:,
+    >:,
     <<,
     <=,
     ==,
@@ -273,21 +274,18 @@ export
     .>>,
     .<<,
     >>>,
-    &>,
-    &>>,
-    &<,
-    &<<,
     \,
     ^,
     |,
+    |>,
+    <|,
     ~
 
 import
     Base.!, Base.!=, Base.$, Base.%, Base.&, Base.*, Base.+, Base.-, Base..!=,
     Base..+, Base..-, Base..*, Base../, Base..<, Base..<=, Base..==, Base..>,
     Base..>=, Base..\, Base..^, Base./, Base.//, Base.<, Base.<:, Base.<<,
     Base.<=, Base.==, Base.>, Base.>=, Base.>>, Base..>>, Base..<<, Base.>>>,
-    Base.&>, Base.&>>, Base.&<, Base.&<<, Base.\, Base.^, Base.|, Base.~,
-    Base.!==
+    Base.<|, Base.|>, Base.\, Base.^, Base.|, Base.~, Base.!==, Base.>:
 
 end
diff --git a/src/julia-parser.scm b/src/julia-parser.scm
@@ -6,11 +6,11 @@
      ; note: there are some strange-looking things in here because
      ; the way the lexer works, every prefix of an operator must also
      ; be an operator.
-     (<- -- -->)
-     (> < >= <= == === != !== |.>| |.<| |.>=| |.<=| |.==| |.!=| |.=| |.!| |<:| |>:| |&>| |&<|)
+     (-- -->)
+     (> < >= <= == === != !== |.>| |.<| |.>=| |.<=| |.==| |.!=| |.=| |.!| |<:| |>:| |\|>| |<\||)
      (: |..|)
      (+ - |.+| |.-| |\|| $)
-     (<< >> >>> |.<<| |.>>| |&>>| |&<<|)
+     (<< >> >>> |.<<| |.>>|)
      (* / |./| % & |.*| |\\| |.\\|)
      (// .//)
      (^ |.^|)
-Original file line number
+Diff line change
@@ Expand Up / @@ -223,10 +223,6 @@ export @@
         #.>>,
         #.<<,
         >>>,
-        #&>,
-        #&>>,
-        #&<,
-        #&<<,
         \,
         ^,
         |,
@@ Expand Down @@