Removed the ++ and -- operators #281

divadretlaw · 2015-12-06T15:11:30Z

Removed the ++ and -- operators as they will no longer work with
upcoming changes

https://github.com/apple/swift-evolution/blob/master/proposals/0004-remove-pre-post-inc-decrement.md

Removed the ++ and -- operators as they will no longer work with upcoming changes

Removed some C-style loops and postincrements

azdavis · 2015-12-06T15:53:06Z

test/1_stdlib/StringTraps.swift

-  ++i
+  i = i.successor()
+  i = i.successor()
+  i = i.successor()


Maybe I'm missing something, but why not use i += 3? Seems more succinct.

i += 3 does not work with an Index
i = i.advancedBy(3) could be used but maybe whoever originally wrote that code wanted to use 3 statements for whatever reason.

azdavis · 2015-12-06T16:39:39Z

Ah, I was wondering why you weren't using arithmetic operators; I didn't realize Index was its own class. Anyway, 👍

gribozavr · 2015-12-06T21:26:51Z

stdlib/private/SwiftPrivate/ShardedAtomicCounter.swift

@@ -34,7 +34,8 @@ public struct _stdlib_ShardedAtomicCounter {
    let hardwareConcurrency = _stdlib_getHardwareConcurrency()
    let count = max(8, hardwareConcurrency * hardwareConcurrency)
    let shards = UnsafeMutablePointer<Int>.alloc(count)
-    for var i = 0; i != count; i++ {
+    for i in 0...count {


This should be 0..<count.

gribozavr · 2015-12-06T21:32:55Z

Thank you! There are a lot more in the tests.

Simplfied successor for UnsafePointer and removed unnecessary comments

Removed some post-, preincrement/decrements from test

gribozavr · 2015-12-06T23:57:49Z

test/1_stdlib/StringTraps.swift

-  ++i
-  ++i
-  ++i
+  i = i.advancedBy(3)


Please keep the test code the exact equivalent. The test name says it is testing the successor() function.

gribozavr · 2015-12-06T23:58:33Z

Please remove unrelated whitespace changes from the patch.

gribozavr · 2015-12-07T01:17:05Z

stdlib/public/core/ArrayBufferType.swift

      }
      // Initialize the hole left by sliding the tail forward
      for j in oldTailIndex..<newTailIndex {
-        (elements + j).initialize(newValues[i++])
+        (elements + j).initialize(newValues[i])
+        i = i.successor()


i._successorInPlace()

gribozavr · 2015-12-07T01:19:43Z

Please compile the code and run tests before submitting -- utils/build-script -RT.

katzenbaer · 2015-12-09T19:38:20Z

Would it be better if this change was merged in at the same time as the removal of the post/pre operators?

gribozavr · 2015-12-09T19:40:22Z

No, for two reasons: incremental development, and shaking out possible performance issues.

katzenbaer · 2015-12-09T19:49:54Z

@gribozavr Just to clarify, is that reasoning for accepted proposals? I understand this isn't the case here, but I would imagine it to be counterproductive to merge in changes when the decision has yet to be finalized.

gribozavr · 2015-12-09T20:03:30Z

@katzenbaer Yes, just for accepted proposals.

gribozavr · 2015-12-22T07:38:26Z

@divadretlaw I'm sorry for the delays, would you mind rebasing the PR and resolving the conflicts?

lattner · 2015-12-22T17:50:56Z

Oh, I'm sorry, I didn't realize that there was an outstanding patch to help with this.

# Conflicts: # stdlib/private/SwiftPrivate/ShardedAtomicCounter.swift # stdlib/public/core/ArrayCast.swift # stdlib/public/core/Collection.swift # stdlib/public/core/ContiguousArrayBuffer.swift # stdlib/public/core/StringBuffer.swift # stdlib/public/core/StringUnicodeScalarView.swift # test/1_stdlib/Builtins.swift # test/1_stdlib/Collection.swift # test/1_stdlib/ErrorType.swift # test/1_stdlib/ErrorTypeBridging.swift # test/1_stdlib/ExistentialCollection.swift # test/1_stdlib/Float.swift # test/1_stdlib/Map.swift # test/1_stdlib/Mirror.swift # test/1_stdlib/Optional.swift # test/DebugInfo/arg-debug_value.swift # test/DebugInfo/closure.swift # test/DebugInfo/for.swift # test/DebugInfo/return.swift # test/Interpreter/availability_weak_linking.swift # test/Interpreter/break_continue.swift # test/SILGen/sil_locations.swift # test/SILGen/statements.swift # test/SILGen/unreachable_code.swift # test/SILPasses/definite_init_diagnostics.swift # test/SILPasses/return.swift # test/SILPasses/switch.swift # test/SILPasses/unreachable_code.swift

Removed the ++ and -- operators

gribozavr · 2015-12-26T11:47:58Z

Sorry, but this change causes test failures:

Failing Tests (3):
    Swift :: SILGen/coverage_while.swift
    Swift :: SILGen/sil_locations.swift
    Swift :: Sema/immutability.swift

I'll revert.

gribozavr · 2015-12-26T11:48:45Z

@divadretlaw Could you take a look at the test failures, fix and resubmit a new PR?

the buffer size ioctls on linux return EINVAL when it's not supported

the buffer size ioctls on linux return EINVAL when it's not supported Signed-off-by: Daniel A. Steffen <[email protected]>

divadretlaw added 2 commits December 6, 2015 16:09

Removed the ++ and -- operators

22126b0

Removed the ++ and -- operators as they will no longer work with upcoming changes

Removed C-style loops and postincrements

e178c51

Removed some C-style loops and postincrements

azdavis reviewed Dec 6, 2015
View reviewed changes

Replaced 3x 'i = i.successor()' into 'i = i.advancedBy(3)'

83ebfc2

More postincrements from stdlib

0d89366

gribozavr reviewed Dec 6, 2015
View reviewed changes

divadretlaw added 3 commits December 6, 2015 22:40

Simplfied successor for UnsafePointer

91ffddd

Simplfied successor for UnsafePointer and removed unnecessary comments

Removed some post-, preincrement/decrements from test

9513d17

Removed some post-, preincrement/decrements from test

Some more

ab4c05e

gribozavr reviewed Dec 6, 2015
View reviewed changes

divadretlaw added 2 commits December 7, 2015 01:12

Revert to 3 successor statements

8071989

Reverted Whitespace changes

700dabb

gribozavr reviewed Dec 7, 2015
View reviewed changes

Reverted more whitespace

f71dc7f

divadretlaw added 10 commits December 7, 2015 02:47

Reverted unnecessary changes

4d80d10

Error fixes

fc8b73b

Error fix

6603014

Revert statements.swift

2417127

Added removed whitespace

a6457b2

Merge remote-tracking branch 'apple/master'

8ed7ae9

Merge remote-tracking branch 'apple/master'

54f2679

Merge remote-tracking branch 'apple/master'

e29f608

Merge remote-tracking branch 'apple/master'

dacd683

Merge remote-tracking branch 'apple/master'

4c2a6fc

divadretlaw added 5 commits December 24, 2015 13:18

Removed Whitespace changes

989da86

Removed whitespace changes

bdc3992

Reverted change

8e46246

Cleanup

8849aa3

lattner added a commit that referenced this pull request Dec 26, 2015

Merge pull request #281 from divadretlaw/master

fc9887f

Removed the ++ and -- operators

lattner merged commit fc9887f into swiftlang:master Dec 26, 2015

gribozavr mentioned this pull request Dec 26, 2015

Revert "Removed the ++ and -- operators" #780

Merged

slavapestov pushed a commit to slavapestov/swift that referenced this pull request Nov 27, 2018

Merge pull request swiftlang#281 from apple/mad/epoll-fixes-2

8947dcf

the buffer size ioctls on linux return EINVAL when it's not supported

slavapestov pushed a commit to slavapestov/swift that referenced this pull request Nov 27, 2018

Merge pull request swiftlang#281 from apple/mad/epoll-fixes-2

cfdc94d

the buffer size ioctls on linux return EINVAL when it's not supported Signed-off-by: Daniel A. Steffen <[email protected]>

Removed the ++ and -- operators #281

Removed the ++ and -- operators #281

Uh oh!

Conversation

divadretlaw commented Dec 6, 2015

Uh oh!

azdavis Dec 6, 2015

Choose a reason for hiding this comment

Uh oh!

divadretlaw Dec 6, 2015

Choose a reason for hiding this comment

Uh oh!

azdavis commented Dec 6, 2015

Uh oh!

gribozavr Dec 6, 2015

Choose a reason for hiding this comment

Uh oh!

gribozavr commented Dec 6, 2015

Uh oh!

gribozavr Dec 6, 2015

Choose a reason for hiding this comment

Uh oh!

gribozavr commented Dec 6, 2015

Uh oh!

gribozavr Dec 7, 2015

Choose a reason for hiding this comment

Uh oh!

gribozavr commented Dec 7, 2015

Uh oh!

katzenbaer commented Dec 9, 2015

Uh oh!

gribozavr commented Dec 9, 2015

Uh oh!

katzenbaer commented Dec 9, 2015

Uh oh!

gribozavr commented Dec 9, 2015

Uh oh!

gribozavr commented Dec 22, 2015

Uh oh!

lattner commented Dec 22, 2015

Uh oh!

gribozavr commented Dec 26, 2015

Uh oh!

gribozavr commented Dec 26, 2015

Uh oh!

Uh oh!