Skip to content

Commit

Permalink
Merge branch 'ponyc-0.7.0' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
SeanTAllen committed Oct 22, 2016
2 parents 552011b + dfab9c1 commit 4986123
Show file tree
Hide file tree
Showing 25 changed files with 704 additions and 72 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ branches:

environment:
matrix:
- llvm: 3.9.0
- llvm: 3.8.0
- llvm: 3.7.1

Expand Down Expand Up @@ -96,7 +97,7 @@ deploy:
version: $(appveyor_build_version)
on:
branch: master
llvm: 3.8.0
llvm: 3.9.0
configuration: Release
publish: true

Expand All @@ -110,7 +111,7 @@ deploy:
version: $(appveyor_build_version)
on:
branch: release
llvm: 3.8.0
llvm: 3.9.0
configuration: Release
publish: true

Expand Down
44 changes: 42 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,32 @@ matrix:
- config=release
- CC1=gcc-5
- CXX1=g++-5
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- LLVM_VERSION="3.9.0"
- LLVM_CONFIG="llvm-config-3.9"
- config=debug
- CC1=gcc-5
- CXX1=g++-5
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- LLVM_VERSION="3.9.0"
- LLVM_CONFIG="llvm-config-3.9"
- config=release
- CC1=gcc-5
- CXX1=g++-5
- os: osx
env:
- LLVM_CONFIG="llvm-config-3.6"
Expand Down Expand Up @@ -127,6 +153,20 @@ matrix:
- lto=no
- CC1=clang-3.8
- CXX1=clang++-3.8
# LLVM 3.9 can be enabled for OSX once Homebrew supports it.
#- os: osx
# env:
# - LLVM_CONFIG="llvm-config-3.9"
# - config=debug
# - CC1=clang-3.9
# - CXX1=clang++-3.9
#- os: osx
# env:
# - LLVM_CONFIG="llvm-config-3.9"
# - config=release
# - CC1=clang-3.9
# - CXX1=clang++-3.9


rvm:
- 2.2.3
Expand All @@ -136,7 +176,7 @@ install:
# prepare to deploy artifacts.
- if [[
"$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
"$LLVM_VERSION" == "3.8.0" &&
"$LLVM_VERSION" == "3.9.0" &&
"$config" == "release" &&
"$TRAVIS_OS_NAME" == "linux" &&
"$TRAVIS_PULL_REQUEST" == "false"
Expand Down Expand Up @@ -207,7 +247,7 @@ after_success:
# For a master release build with the latest stable LLVM, upload docs.
- if [[
"$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
"$LLVM_VERSION" == "3.8.0" &&
"$LLVM_VERSION" == "3.9.0" &&
"$config" == "release" &&
"$TRAVIS_OS_NAME" == "linux" &&
"$TRAVIS_PULL_REQUEST" == "false" &&
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

All notable changes to the Pony compiler and standard library will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).

## [0.7.0] - 2016-10-22

### Fixed

- Concatenate docstrings from case methods (issue #575).

### Added

- TCP read and write backpressure hooks in `TCPConnection` (issue #1311)
- Allow TCP notifiers to cause connections to yield while receiving (issue #1343)

### Changed

- `break` without a value now generates its value from the `else` branch of a loop instead of being an implicit `break None`.
- The `for` loop will now break out of the loop instead of continuing with the following iterations if `Iterator.next` errors.

## [0.6.0] - 2016-10-20

### Fixed
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ Pony requires one of the following versions of LLVM:
- 3.6.2
- 3.7.1
- 3.8.1
- 3.9.0 (unsupported on OSX at the moment)

Compiling Pony is only possible on x86 and ARM (either 32 or 64 bits).

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.7.0
3 changes: 2 additions & 1 deletion examples/echo/echo.pony
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ class Server is TCPConnectionNotify
fun ref accepted(conn: TCPConnection ref) =>
_out.print("connection accepted")

fun ref received(conn: TCPConnection ref, data: Array[U8] iso) =>
fun ref received(conn: TCPConnection ref, data: Array[U8] iso): Bool =>
_out.print("data received, looping it back")
conn.write("server says: ")
conn.write(consume data)
true

fun ref closed(conn: TCPConnection ref) =>
_out.print("server closed")
3 changes: 2 additions & 1 deletion examples/net/client.pony
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ class ClientSide is TCPConnectionNotify
fun ref connect_failed(conn: TCPConnection ref) =>
_env.out.print("connect failed")

fun ref received(conn: TCPConnection ref, data: Array[U8] iso) =>
fun ref received(conn: TCPConnection ref, data: Array[U8] iso): Bool =>
_env.out.print(consume data)
true

fun ref closed(conn: TCPConnection ref) =>
_env.out.print("client closed")
3 changes: 2 additions & 1 deletion examples/net/server.pony
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ class ServerSide is TCPConnectionNotify
conn.write("server says hi")
end

fun ref received(conn: TCPConnection ref, data: Array[U8] iso) =>
fun ref received(conn: TCPConnection ref, data: Array[U8] iso): Bool =>
_env.out.print(consume data)
conn.dispose()
true

fun ref closed(conn: TCPConnection ref) =>
_env.out.print("server closed")
Loading

0 comments on commit 4986123

Please sign in to comment.