mirror of
https://github.com/aNNiMON/Own-Programming-Language-Tutorial.git
synced 2024-09-20 00:34:20 +03:00
Gradle 8, Java 17+
This commit is contained in:
parent
fed61592ba
commit
66140ace3f
23
.travis.yml
23
.travis.yml
@ -1,23 +0,0 @@
|
||||
language: java
|
||||
sudo: false
|
||||
install: true
|
||||
|
||||
jdk:
|
||||
- openjdk8
|
||||
|
||||
addons:
|
||||
sonarcloud:
|
||||
organization: "annimon-github"
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.m2
|
||||
- $HOME/.gradle
|
||||
- $HOME/.sonar/cache
|
||||
|
||||
before_install:
|
||||
- chmod +x gradlew
|
||||
|
||||
after_success:
|
||||
- ./gradlew proguard sonarqube
|
||||
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "latest" && curl -F "file=@store/OwnLang.jar" http://projects.annimon.com/samples/php/travis/upload.php?mode=ownlang
|
||||
124
build.gradle
124
build.gradle
@ -1,25 +1,11 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.sf.proguard:proguard-gradle:6.0.1'
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
id "java"
|
||||
id "com.github.johnrengelman.shadow" version "2.0.2"
|
||||
id "org.sonarqube" version "2.6.2"
|
||||
id 'java'
|
||||
}
|
||||
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
import proguard.gradle.ProGuardTask
|
||||
group = 'com.annimon'
|
||||
version = '2.0-SNAPSHOT'
|
||||
|
||||
|
||||
sourceCompatibility = '1.8'
|
||||
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
||||
|
||||
if (!hasProperty('mainClass')) {
|
||||
ext.mainClass = 'com.annimon.ownlang.Main'
|
||||
}
|
||||
@ -28,10 +14,10 @@ ext.generatedJavaDir = "${rootProject.projectDir}/src/main/generatedJava"
|
||||
sourceSets.main.java.srcDirs += project.generatedJavaDir
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
task generateJavaSources() {
|
||||
tasks.register('generateJavaSources') {
|
||||
doLast {
|
||||
def source = """
|
||||
package com.annimon.ownlang;
|
||||
@ -39,7 +25,7 @@ task generateJavaSources() {
|
||||
private Gen() {}
|
||||
public static final String BUILD_DATE = "${new Date().format('YYMMdd')}";
|
||||
}
|
||||
"""
|
||||
""".stripIndent()
|
||||
def genFile = new File("${project.generatedJavaDir}/com/annimon/ownlang/Gen.java")
|
||||
genFile.getParentFile().mkdirs()
|
||||
genFile.write(source)
|
||||
@ -47,98 +33,38 @@ task generateJavaSources() {
|
||||
}
|
||||
compileJava.dependsOn(generateJavaSources)
|
||||
|
||||
task run(dependsOn: classes, type: JavaExec) {
|
||||
main = project.mainClass
|
||||
tasks.register('run', JavaExec) {
|
||||
dependsOn classes
|
||||
mainClass = project.mainClass
|
||||
classpath = sourceSets.main.runtimeClasspath
|
||||
standardInput = System.in
|
||||
ignoreExitValue = true
|
||||
ignoreExitValue true
|
||||
}
|
||||
|
||||
task runOptimizing(dependsOn: classes, type: JavaExec) {
|
||||
main = project.mainClass
|
||||
tasks.register('runOptimizing', JavaExec) {
|
||||
dependsOn classes
|
||||
mainClass = project.mainClass
|
||||
classpath = sourceSets.main.runtimeClasspath
|
||||
ignoreExitValue = true
|
||||
// args '-o 9 -m -a -f examples/game/minesweeper.own'.split(' ')
|
||||
ignoreExitValue true
|
||||
args '-o 9 -m -a -f program.own'.split(' ')
|
||||
}
|
||||
|
||||
task dist(type: ShadowJar) {
|
||||
from sourceSets.main.output
|
||||
configurations = [project.configurations.runtime]
|
||||
destinationDir file("$rootProject.projectDir/dist")
|
||||
|
||||
exclude 'META-INF/*.DSA'
|
||||
exclude 'META-INF/*.RSA'
|
||||
exclude 'META-INF/maven/**'
|
||||
exclude 'LICENSE*'
|
||||
|
||||
manifest.attributes(
|
||||
'Main-Class': project.mainClass,
|
||||
'Build-Date': new Date().format('YYMMdd')
|
||||
)
|
||||
}
|
||||
|
||||
task proguard(dependsOn: dist, type: ProGuardTask) {
|
||||
configuration "$rootProject.projectDir/proguard.properties"
|
||||
injars "$rootProject.projectDir/dist/OwnLang.jar"
|
||||
outjars "$rootProject.projectDir/store/OwnLang.jar"
|
||||
|
||||
// Automatically handle the Java version of this build.
|
||||
if (System.getProperty('java.version').startsWith('1.')) {
|
||||
// Before Java 9, the runtime classes were packaged in a single jar file.
|
||||
libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
|
||||
} else {
|
||||
// As of Java 9, the runtime classes are packaged in modular jmod files.
|
||||
def jmods = files { file("${System.getProperty('java.home')}/jmods").listFiles() }
|
||||
jmods.each {
|
||||
libraryjars it, jarfilter: '!**.jar', filter: '!module-info.class'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task sandbox(dependsOn: proguard, type: Jar) {
|
||||
from zipTree("$rootProject.projectDir/store/OwnLang.jar")
|
||||
libsDirName = "$rootProject.projectDir/store"
|
||||
appendix = "Sandbox"
|
||||
|
||||
exclude "**/modules/canvas/**", "**/modules/canvasfx/**", "**/modules/forms/**",
|
||||
"**/modules/java/**", "**/modules/jdbc/**", "**/modules/robot/**",
|
||||
"**/modules/okhttp/**",
|
||||
"**/modules/socket/**", "io/**",
|
||||
"**/modules/aimp/**", "aimpremote/**",
|
||||
"**/modules/downloader/**",
|
||||
"**/modules/zip/**", "**/modules/gzip/**",
|
||||
"jline/**", "org/fusesource/**", "META-INF/native/**"
|
||||
|
||||
manifest {
|
||||
attributes 'Main-Class': project.mainClass
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile ('io.socket:socket.io-client:1.0.0') {
|
||||
exclude group: 'org.json', module: 'json'
|
||||
implementation ('io.socket:socket.io-client:1.0.2') {
|
||||
exclude group: 'org.json', module: 'json'
|
||||
}
|
||||
compile 'org.json:json:20180130'
|
||||
compile 'org.yaml:snakeyaml:1.20'
|
||||
compile 'jline:jline:2.14.5'
|
||||
implementation 'org.json:json:20230227'
|
||||
implementation 'org.yaml:snakeyaml:1.20'
|
||||
implementation 'jline:jline:2.14.5'
|
||||
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation 'org.openjdk.jmh:jmh-core:1.13'
|
||||
testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.13'
|
||||
}
|
||||
|
||||
sonarqube {
|
||||
properties {
|
||||
property "sonar.projectName", "Own-Programming-Language-Tutorial"
|
||||
property "sonar.projectKey", "aNNiMON_Own-Programming-Language-Tutorial"
|
||||
property "sonar.host.url", "https://sonarcloud.io"
|
||||
}
|
||||
testImplementation platform('org.junit:junit-bom:5.9.2')
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter'
|
||||
testImplementation 'org.openjdk.jmh:jmh-core:1.37'
|
||||
testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
|
||||
}
|
||||
|
||||
test {
|
||||
testLogging {
|
||||
events "passed", "skipped", "failed"
|
||||
exceptionFormat "full"
|
||||
}
|
||||
useJUnitPlatform()
|
||||
}
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
6
gradle/wrapper/gradle-wrapper.properties
vendored
6
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Fri Mar 09 10:54:07 EET 2018
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
|
||||
#Sat Aug 12 23:03:44 EEST 2023
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
291
gradlew
vendored
291
gradlew
vendored
@ -1,78 +1,129 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
MAX_FD=maximum
|
||||
|
||||
warn ( ) {
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
} >&2
|
||||
|
||||
die ( ) {
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
@ -89,81 +140,95 @@ location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
case $i in
|
||||
(0) set -- ;;
|
||||
(1) set -- "$args0" ;;
|
||||
(2) set -- "$args0" "$args1" ;;
|
||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
|
||||
cd "$(dirname "$0")"
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
||||
43
gradlew.bat
vendored
43
gradlew.bat
vendored
@ -1,3 +1,19 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
@ -35,7 +54,7 @@ goto fail
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
@ -45,28 +64,14 @@ echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
@ -173,14 +173,14 @@ def fact2(n) = match n {
|
||||
println fact1(6)
|
||||
println fact2(6)
|
||||
|
||||
class = {
|
||||
functions = {
|
||||
"add": def(a, b) = a + b,
|
||||
"sub": def(a, b) = a - b,
|
||||
"mul": def(a, b) = a * b,
|
||||
"div": def(a, b) = a / b
|
||||
}
|
||||
|
||||
println class.add(2, class.mul(2, 2))
|
||||
println functions.add(2, functions.mul(2, 2))
|
||||
|
||||
println split("1/2/3/4/5/6", "/")
|
||||
println join(nums, ", ")
|
||||
|
||||
@ -6,7 +6,7 @@ import com.annimon.ownlang.outputsettings.OutputSettings;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.PrintStream;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
public class Console {
|
||||
|
||||
@ -69,11 +69,7 @@ public class Console {
|
||||
throwable.printStackTrace(ps);
|
||||
ps.flush();
|
||||
}
|
||||
try {
|
||||
error(baos.toString("UTF-8"));
|
||||
} catch (UnsupportedEncodingException ex) {
|
||||
error(baos.toString());
|
||||
}
|
||||
error(baos.toString(StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
public static File fileInstance(String path) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.annimon.ownlang.modules.canvasfx;
|
||||
|
||||
import com.annimon.ownlang.exceptions.TypeException;
|
||||
/*import com.annimon.ownlang.exceptions.TypeException;
|
||||
import com.annimon.ownlang.lib.*;
|
||||
import com.annimon.ownlang.modules.Module;
|
||||
import static com.annimon.ownlang.lib.Converters.*;
|
||||
@ -37,15 +37,15 @@ import javafx.scene.shape.FillRule;
|
||||
import javafx.scene.shape.StrokeLineCap;
|
||||
import javafx.scene.shape.StrokeLineJoin;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JFrame;*/
|
||||
|
||||
/**
|
||||
*
|
||||
* @author aNNiMON
|
||||
*/
|
||||
public final class canvasfx implements Module {
|
||||
public final class canvasfx /*implements Module*/ {
|
||||
|
||||
private static final int FX_EFFECT_TYPE = 5301;
|
||||
/*private static final int FX_EFFECT_TYPE = 5301;
|
||||
private static final int FX_COLOR_TYPE = 5302;
|
||||
|
||||
private static JFrame frame;
|
||||
@ -1112,6 +1112,6 @@ public final class canvasfx implements Module {
|
||||
map.set("isConsumed", NumberValue.fromBoolean(e.isConsumed()));
|
||||
map.set("isDropCompleted", NumberValue.fromBoolean(e.isDropCompleted()));
|
||||
handler.execute(map);
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
@ -2,8 +2,9 @@ package com.annimon.ownlang.parser;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.openjdk.jmh.annotations.*;
|
||||
import org.openjdk.jmh.runner.Runner;
|
||||
import org.openjdk.jmh.runner.RunnerException;
|
||||
@ -32,7 +33,7 @@ public class LexerBenchmarkTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Disabled
|
||||
@Test
|
||||
public void executeBenchmark() throws RunnerException {
|
||||
Options opt = new OptionsBuilder()
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
package com.annimon.ownlang.parser;
|
||||
|
||||
import com.annimon.ownlang.exceptions.LexerException;
|
||||
import static com.annimon.ownlang.parser.TokenType.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import static com.annimon.ownlang.parser.TokenType.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
*
|
||||
@ -25,10 +27,10 @@ public class LexerTest {
|
||||
assertEquals("f7d6c5", result.get(3).getText());
|
||||
}
|
||||
|
||||
@Test(expected = LexerException.class)
|
||||
@Test
|
||||
public void testNumbersError() {
|
||||
String input = "3.14.15 0Xf7_p6_s5";
|
||||
Lexer.tokenize(input);
|
||||
final String input = "3.14.15 0Xf7_p6_s5";
|
||||
assertThrows(LexerException.class, () -> Lexer.tokenize(input));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -74,13 +76,15 @@ public class LexerTest {
|
||||
assertEquals("", result.get(0).getText());
|
||||
}
|
||||
|
||||
@Test(expected = LexerException.class)
|
||||
@Test
|
||||
public void testStringError() {
|
||||
String input = "\"1\"\"";
|
||||
List<Token> expList = list(TEXT);
|
||||
List<Token> result = Lexer.tokenize(input);
|
||||
assertTokens(expList, result);
|
||||
assertEquals("1", result.get(0).getText());
|
||||
assertThrows(LexerException.class, () -> {
|
||||
List<Token> result = Lexer.tokenize(input);
|
||||
assertTokens(expList, result);
|
||||
assertEquals("1", result.get(0).getText());
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -117,16 +121,16 @@ public class LexerTest {
|
||||
assertTokens(expList, result);
|
||||
}
|
||||
|
||||
@Test(expected = LexerException.class)
|
||||
@Test
|
||||
public void testCommentsError() {
|
||||
String input = "/* 1234 \n";
|
||||
Lexer.tokenize(input);
|
||||
final String input = "/* 1234 \n";
|
||||
assertThrows(LexerException.class, () -> Lexer.tokenize(input));
|
||||
}
|
||||
|
||||
@Test(expected = LexerException.class)
|
||||
@Test
|
||||
public void testExtendedWordError() {
|
||||
String input = "` 1234";
|
||||
Lexer.tokenize(input);
|
||||
final String input = "` 1234";
|
||||
assertThrows(LexerException.class, () -> Lexer.tokenize(input));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -3,8 +3,9 @@ package com.annimon.ownlang.parser;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.openjdk.jmh.annotations.*;
|
||||
import org.openjdk.jmh.infra.Blackhole;
|
||||
import org.openjdk.jmh.runner.Runner;
|
||||
@ -34,7 +35,7 @@ public class ParserBenchmarkTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Disabled
|
||||
@Test
|
||||
public void executeBenchmark() throws RunnerException {
|
||||
Options opt = new OptionsBuilder()
|
||||
|
||||
@ -3,9 +3,10 @@ package com.annimon.ownlang.parser;
|
||||
import com.annimon.ownlang.lib.Value;
|
||||
import com.annimon.ownlang.lib.Variables;
|
||||
import com.annimon.ownlang.parser.ast.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static com.annimon.ownlang.parser.ast.ASTHelper.*;
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.*;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* @author aNNiMON
|
||||
|
||||
@ -11,37 +11,25 @@ import com.annimon.ownlang.parser.ast.FunctionDefineStatement;
|
||||
import com.annimon.ownlang.parser.ast.Statement;
|
||||
import com.annimon.ownlang.parser.ast.Visitor;
|
||||
import com.annimon.ownlang.parser.visitors.AbstractVisitor;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.Assert;
|
||||
import static org.junit.Assert.*;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.Parameterized.Parameters;
|
||||
|
||||
@RunWith(value = Parameterized.class)
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
public class ProgramsTest {
|
||||
|
||||
private static final String RES_DIR = "src/test/resources";
|
||||
|
||||
private final String programPath;
|
||||
|
||||
public ProgramsTest(String programPath) {
|
||||
this.programPath = programPath;
|
||||
}
|
||||
|
||||
@Parameters(name = "{index}: {0}")
|
||||
public static Collection<String> data() {
|
||||
public static Stream<String> data() {
|
||||
final File resDir = new File(RES_DIR);
|
||||
return scanDirectory(resDir)
|
||||
.map(File::getPath)
|
||||
.collect(Collectors.toList());
|
||||
.map(File::getPath);
|
||||
}
|
||||
|
||||
private static Stream<File> scanDirectory(File dir) {
|
||||
@ -59,7 +47,7 @@ public class ProgramsTest {
|
||||
.filter(f -> f.getName().endsWith(".own"));
|
||||
}
|
||||
|
||||
@Before
|
||||
@BeforeEach
|
||||
public void initialize() {
|
||||
Variables.clear();
|
||||
Functions.clear();
|
||||
@ -85,25 +73,22 @@ public class ProgramsTest {
|
||||
return NumberValue.ONE;
|
||||
});
|
||||
Functions.set("assertFail", (args) -> {
|
||||
try {
|
||||
((FunctionValue) args[0]).getValue().execute();
|
||||
fail("Function should fail");
|
||||
} catch (Throwable thr) {
|
||||
|
||||
}
|
||||
assertThrows(Throwable.class,
|
||||
() -> ((FunctionValue) args[0]).getValue().execute());
|
||||
return NumberValue.ONE;
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProgram() throws IOException {
|
||||
@ParameterizedTest
|
||||
@MethodSource("data")
|
||||
public void testProgram(String programPath) throws IOException {
|
||||
final String source = SourceLoader.readSource(programPath);
|
||||
final Statement s = Parser.parse(Lexer.tokenize(source));
|
||||
try {
|
||||
s.execute();
|
||||
s.accept(testFunctionsExecutor);
|
||||
} catch (Exception oae) {
|
||||
Assert.fail(oae.toString());
|
||||
fail(oae.toString());
|
||||
}
|
||||
}
|
||||
|
||||
@ -117,7 +102,7 @@ public class ProgramsTest {
|
||||
s.execute();
|
||||
assertEquals("012345", Console.text());
|
||||
} catch (Exception oae) {
|
||||
Assert.fail(oae.toString());
|
||||
fail(oae.toString());
|
||||
} finally {
|
||||
Console.useSettings(oldSettings);
|
||||
}
|
||||
|
||||
@ -4,7 +4,8 @@ import com.annimon.ownlang.lib.NumberValue;
|
||||
import com.annimon.ownlang.lib.StringValue;
|
||||
import com.annimon.ownlang.lib.Types;
|
||||
import com.annimon.ownlang.lib.Value;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* Helper for build and test AST nodes.
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
package com.annimon.ownlang.parser.ast;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static com.annimon.ownlang.parser.ast.ASTHelper.*;
|
||||
import static com.annimon.ownlang.parser.ast.BinaryExpression.Operator.*;
|
||||
import org.junit.Test;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
/**
|
||||
* @author aNNiMON
|
||||
@ -36,14 +38,16 @@ public class OperatorExpressionTest {
|
||||
assertValue(number(30), operator(DIVIDE, value(-900), operator(DIVIDE, value(60), value(-2))).eval());
|
||||
}
|
||||
|
||||
@Test()
|
||||
@Test
|
||||
public void testDivisionZero() {
|
||||
assertValue(number(Double.POSITIVE_INFINITY), operator(DIVIDE, value(2.0), value(0.0)).eval());
|
||||
}
|
||||
|
||||
@Test(expected = RuntimeException.class)
|
||||
@Test
|
||||
public void testDivisionZeroOnIntegers() {
|
||||
operator(DIVIDE, value(2), value(0)).eval();
|
||||
assertThrows(RuntimeException.class,
|
||||
() -> operator(DIVIDE, value(2), value(0)).eval());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -57,9 +61,10 @@ public class OperatorExpressionTest {
|
||||
assertValue(number(Double.NaN), operator(REMAINDER, value(2.0), value(0.0)).eval());
|
||||
}
|
||||
|
||||
@Test(expected = RuntimeException.class)
|
||||
@Test
|
||||
public void testRemainderZeroOnIntegers() {
|
||||
operator(REMAINDER, value(2), value(0)).eval();
|
||||
assertThrows(RuntimeException.class,
|
||||
() -> operator(REMAINDER, value(2), value(0)).eval());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
package com.annimon.ownlang.parser.ast;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static com.annimon.ownlang.parser.ast.ASTHelper.*;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
package com.annimon.ownlang.parser.ast;
|
||||
|
||||
import static com.annimon.ownlang.parser.ast.ASTHelper.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import com.annimon.ownlang.exceptions.VariableDoesNotExistsException;
|
||||
import org.junit.Test;
|
||||
|
||||
import static com.annimon.ownlang.parser.ast.ASTHelper.*;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
/**
|
||||
*
|
||||
@ -27,8 +29,9 @@ public class VariableExpressionTest {
|
||||
assertValue(number(8), var("a").eval());
|
||||
}
|
||||
|
||||
@Test(expected = VariableDoesNotExistsException.class)
|
||||
@Test
|
||||
public void testUnknownVariable() {
|
||||
var("a").eval();
|
||||
assertThrows(VariableDoesNotExistsException.class,
|
||||
() -> var("a").eval());
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user