kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-11-10 12:47:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #175 from prt2121/pt/kotlin-1

Browse Source 
Bump Kotlin version to 1.0
This commit is contained in:
Joel Martin 2016-02-15 20:39:03 -06:00
commit 0dbbb7be5b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -371,7 +371,7 @@ julia stepX_YYY.jl
*The Kotlin implementation was created by [Javier Fernandez-Ivern](https://github.com/ivern)*
The Kotlin implementation of mal has been tested with Kotlin 1.0.0-beta.
The Kotlin implementation of mal has been tested with Kotlin 1.0.
```
cd kotlin

4
kotlin/Dockerfile
View File

@ -25,10 +25,10 @@ WORKDIR /mal
RUN apt-get -y install openjdk-7-jdk
RUN apt-get -y install unzip
RUN curl -O -J -L https://github.com/JetBrains/kotlin/releases/download/build-1.0.0-beta-4584/kotlin-compiler-1.0.0-beta-4584.zip
RUN curl -O -J -L https://github.com/JetBrains/kotlin/releases/download/build-1.0.0/kotlin-compiler-1.0.0.zip
RUN mkdir -p /kotlin-compiler
RUN unzip kotlin-compiler-1.0.0-beta-4584.zip -d /kotlin-compiler
RUN unzip kotlin-compiler-1.0.0.zip -d /kotlin-compiler
ENV KOTLIN_HOME /kotlin-compiler/kotlinc
ENV PATH $KOTLIN_HOME/bin:$PATH

2
kotlin/src/mal/reader.kt
View File

@ -95,7 +95,7 @@ fun read_hashmap(reader: Reader): MalType {
}
if (key != null) {
hashMap.assoc_BANG(key as MalString, value as MalType)
hashMap.assoc_BANG(key, value as MalType)
}
} while (key != null)