diff --git a/.gitmodules b/.gitmodules index 9395750..d493df0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,9 @@ [submodule "libdparse"] path = libdparse url = https://github.com/dlang-community/libdparse.git -[submodule "makd"] - path = makd - url = https://github.com/sociomantic-tsunami/makd -[submodule "beaver"] - path = beaver - url = https://github.com/sociomantic-tsunami/beaver.git [submodule "stdx-allocator"] path = stdx-allocator url = https://github.com/dlang-community/stdx-allocator +[submodule "d-test-utils"] + path = d-test-utils + url = https://github.com/dlang-community/d-test-utils.git diff --git a/.travis.sh b/.travis.sh index fa34497..cb48753 100755 --- a/.travis.sh +++ b/.travis.sh @@ -3,7 +3,7 @@ set -e if [[ $BUILD == dub ]]; then - dub build --build=release + rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=release elif [[ $DC == ldc2 ]]; then git submodule update --init --recursive make ldc -j2 diff --git a/.travis.yml b/.travis.yml index 3ce2881..de60590 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,51 +1,30 @@ sudo: false language: d d: - #- dmd-nightly - - dmd-beta - dmd - - ldc-beta - ldc os: - linux -# - osx # disabled until travis has more mac resources + - osx + +branches: + only: + - master + - /^v\d+\.\d+\.\d+([+-]\S*)*$/ env: - BUILD= - - BUILD=dub + - BUILD=dub LIBDPARSE_VERSION=min + - BUILD=dub LIBDPARSE_VERSION=max script: ./.travis.sh jobs: include: - - stage: Build & Upload Package - if: tag IS present - # Which package to deploy - env: - - DMD=2.076.* - - DIST=xenial - - PATH="$(git config -f .gitmodules submodule.beaver.path)/bin:$PATH" - language: generic - sudo: required - services: - - docker - git: - submodules: false - before_install: git submodule update --init - install: beaver dlang install - script: - - beaver dlang make pkg - deploy: - provider: script - script: beaver bintray upload -d dlang-community/apt/dfmt build/last/pkg/*.deb - skip_cleanup: true - on: - tags: true # must be a git tag - repo: dlang-community/dfmt # must be a tag on dlang-community - stage: GitHub Release #if: tag IS present - d: ldc-1.8.0 + d: ldc-1.13.0 os: linux script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -59,7 +38,7 @@ jobs: tags: true - stage: GitHub Release #if: tag IS present - d: ldc-1.8.0 + d: ldc-1.13.0 os: osx script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -82,16 +61,35 @@ jobs: apt: packages: - p7zip-full - - wine - deploy: - provider: releases - api_key: $GH_REPO_TOKEN - file_glob: true - file: bin/dfmt-*.zip - skip_cleanup: true - on: - repo: dlang-community/dfmt - tags: true + deploy: + provider: releases + api_key: $GH_REPO_TOKEN + file_glob: true + file: bin/dfmt-*.zip + skip_cleanup: true + on: + repo: dlang-community/dfmt + tags: true + - stage: GitHub Release + #if: tag IS present + d: dmd + os: linux + language: generic + sudo: yes + script: echo "Deploying to GitHub releases ..." && ARCH=64 ./release-windows.sh + addons: + apt: + packages: + - p7zip-full + deploy: + provider: releases + api_key: $GH_REPO_TOKEN + file_glob: true + file: bin/dfmt-*.zip + skip_cleanup: true + on: + repo: dlang-community/dfmt + tags: true stages: - name: test if: type = pull_request or (type = push and branch = master) diff --git a/README.md b/README.md index b97e46f..822d70e 100644 --- a/README.md +++ b/README.md @@ -5,50 +5,57 @@ **dfmt** is beta quality. Make backups of your files or use source control when using the **--inplace** option. -## Building -### Using Make +## Installation + +### Installing with DUB + +```sh +> dub run dfmt -- -h +``` + +### Building from source using Make * Clone the repository * Run ```git submodule update --init --recursive``` in the dfmt directory * To compile with DMD, run ```make``` in the dfmt directory. To compile with LDC, run ```make ldc``` instead. The generated binary will be placed in ```dfmt/bin/```. -### Installing with DUB - -```sh -> dub fetch --version='~master' dfmt && dub run dfmt -- -h -``` +### Building from source using dub +* Clone the repository +* run `dub build --build=release`, optionally with `--compiler=ldc2` ## Using By default, dfmt reads its input from **stdin** and writes to **stdout**. If a file name is specified on the command line, input will be read from the file instead, and output will be written to **stdout**. -**dfmt** uses EditorConfig files for configuration. If you run **dfmt** on a -source file it will look for .editorconfig files that apply to that source file. -If no file is specified on the command line, **dfmt** will look for .editorconfig +**dfmt** uses [EditorConfig](http://editorconfig.org/) files for configuration. If you run **dfmt** on a +source file it will look for *.editorconfig* files that apply to that source file. +If no file is specified on the command line, **dfmt** will look for *.editorconfig* files that would apply to a D file in the current working directory. Command -line options can be used instead of .editorconfig files, or to override options -found in .editorconfig files. +line options can be used instead of *.editorconfig* files, or to override options +found there. ### Options -* **--help | -h**: Display command line options -* **--inplace | -i**: A file name is required and the file will be edited in-place. -* **--align_switch_statements**: See **dfmt_align_switch_statements** below -* **--brace_style**: See **brace_style** below -* **--end_of_line**: See **end_of_line** below -* **--indent_size**: See **indent_size** below -* **--indent_style | -t**: See **indent_style** below -* **--max_line_length**: See **max_line_length** below -* **--soft_max_line_length**: See **dfmt_soft_max_line_length** below -* **--outdent_attributes**: See **dfmt_outdent_attributes** below -* **--single_template_constraint_indent**: See **dfmt_template_constraint_style** below -* **--space_after_cast**: See **dfmt_space_after_cast** below -* **--space_before_function_parameters**: See **dfmt_space_before_function_parameters** below -* **--split_operator_at_line_end**: See **dfmt_split_operator_at_line_end** below -* **--tab_width**: See **tab_width** below -* **--selective_import_space**: See **dfmt_selective_import_space** below -* **--compact_labeled_statements**: See **dfmt_compact_labeled_statements** below -* **--template_constraint_style**: See **dfmt_template_constraint_style** below +* `--help | -h`: Display command line options. +* `--inplace | -i`: A file name is required and the file will be edited in-place. +* `--align_switch_statements`: *see dfmt_align_switch_statements [below](#dfmt-specific-properties)* +* `--brace_style`: *see dfmt_brace_style [below](#dfmt-specific-properties)* +* `--compact_labeled_statements`: *see dfmt_compact_labeled_statements [below](#dfmt-specific-properties)* +* `--end_of_line`: *see end_of_line [below](#standard-editorconfig-properties)* +* `--indent_size`: *see indent_size [below](#standard-editorconfig-properties)* +* `--indent_style | -t`: *see indent_style [below](#standard-editorconfig-properties)* +* `--max_line_length`: *see max_line_length [below](#standard-editorconfig-properties)* +* `--outdent_attributes`: *see dfmt_outdent_attributes [below](#dfmt-specific-properties)* +* `--selective_import_space`: *see dfmt_selective_import_space [below](#dfmt-specific-properties)* +* `--single_template_constraint_indent`: *see dfmt_single_template_constraint_indent [below](#dfmt-specific-properties)* +* `--soft_max_line_length`: *see dfmt_soft_max_line_length [below](#dfmt-specific-properties)* +* `--space_after_cast`: *see dfmt_space_after_cast [below](#dfmt-specific-properties)* +* `--space_before_aa_colon`: *see dfmt_space_before_aa_colon [below](#dfmt-specific-properties)* +* `--space_before_function_parameters`: *see dfmt_space_before_function_parameters [below](#dfmt-specific-properties)* +* `--split_operator_at_line_end`: *see dfmt_split_operator_at_line_end [below](#dfmt-specific-properties)* +* `--tab_width`: *see tab_width [below](#standard-editorconfig-properties)* +* `--template_constraint_style`: *see dfmt_template_constraint_style [below](#dfmt-specific-properties)* +* `--keep_line_breaks`: *see dfmt_keep_line_breaks [below](#dfmt-specific-properties)* ### Example ``` @@ -67,7 +74,7 @@ void main(string[] args) // dfmt has no way of knowing that "getopt" is special, so it wraps the // argument list normally - getopt(args, "optionOne", &optionOne, "optionTwo", &optionTwo, "optionThree", &optionThree); + getopt(args, "optionOne", &optionOne, "optionTwo", &optionTwo, "optionThree", &optionThree); // dfmt off getopt(args, @@ -82,31 +89,34 @@ void main(string[] args) **dfmt** uses [EditorConfig](http://editorconfig.org/) configuration files. **dfmt**-specific properties are prefixed with *dfmt_*. ### Standard EditorConfig properties -Property Name | Allowed Values | Default Value | Description ---------------|----------------|---------------|------------ -end_of_line | `cr`, `crlf` and `lf` | `lf` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#end_of_line) -insert_final_newline | | `true` | Not supported. `dfmt` always inserts a final newline. -charset | | `UTF-8` | Not supported. `dfmt` only works correctly on UTF-8. -indent_style | `tab`, `space` | `space` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_style) -indent_size | positive integers | `4` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_size) -tab_width | positive integers | `4` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#tab_width) -trim_trailing_whitespace | | `true` | Not supported. `dfmt` does not emit trailing whitespace. -max_line_length | positive integers | `120` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#max_line_length) +Property Name | Allowed Values | Description +--------------|----------------|------------ +end_of_line | `cr`, `crlf` and **`lf`** | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#end_of_line) +insert_final_newline | **`true`** | Not supported. `dfmt` always inserts a final newline. +charset | **`UTF-8`** | Not supported. `dfmt` only works correctly on UTF-8. +indent_style | `tab`, **`space`** | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_style) +indent_size | positive integers (**`4`**) | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_size) +tab_width | positive integers (**`4`**) | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#tab_width) +trim_trailing_whitespace | **`true`** | Not supported. `dfmt` does not emit trailing whitespace. +max_line_length | positive integers (**`120`**) | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#max_line_length) ### dfmt-specific properties -Property Name | Allowed Values | Default Value | Description ---------------|----------------|---------------|------------ -dfmt_brace_style | `allman`, `otbs`, or `stroustrup` | `allman` | [See Wikipedia](https://en.wikipedia.org/wiki/Brace_style) -dfmt_soft_max_line_length | positive integers | `80` | The formatting process will usually keep lines below this length, but they may be up to max_line_length columns long. -dfmt_align_switch_statements (Not yet implemented) | `true`, `false` | `true` | Align labels, cases, and defaults with their enclosing switch. -dfmt_outdent_attributes (Not yet implemented) | `true`, `false` | `true` | Decrease the indentation level of attributes. -dfmt_split_operator_at_line_end | `true`, `false` | `false` | Place operators on the end of the previous line when splitting lines. -dfmt_space_after_cast | `true`, `false` | `true` | Insert space after the closing paren of a `cast` expression. -dfmt_space_after_keywords (Not yet implemented) | `true`, `false` | `true` | Insert space after `if`, `while`, `foreach`, etc, and before the `(`. -dfmt_space_before_function_parameters | `true`, `false` | `false` | Insert space before the opening paren of a function parameter list. -dfmt_selective_import_space | `true`, `false` | `true` | Insert space after the module name and before the `:` for selective imports. -dfmt_compact_labeled_statements | `true`, `false` | `true` | Place labels on the same line as the labeled `switch`, `for`, `foreach`, or `while` statement. -dfmt_template_constraint_style | `conditional_newline_indent` `conditional_newline` `always_newline` `always_newline_indent` | `conditional_newline_indent` | Control the formatting of template constraints. -dfmt_single_template_constraint_indent | `true`, `false` | `false` | Set if the constraints are indented by a single tab instead of two. Has only an effect for if indentation style if set to `always_newline_indent` or `conditional_newline_indent`. +Property Name | Allowed Values | Description +--------------|----------------|------------ +dfmt_brace_style | **`allman`**, `otbs`, or `stroustrup` | [See Wikipedia](https://en.wikipedia.org/wiki/Brace_style) +dfmt_soft_max_line_length | positive integers (**`80`**) | The formatting process will usually keep lines below this length, but they may be up to *max_line_length* columns long. +dfmt_align_switch_statements | **`true`**, `false` | Align labels, cases, and defaults with their enclosing switch. +dfmt_outdent_attributes (Not yet implemented) | **`true`**, `false`| Decrease the indentation level of attributes. +dfmt_split_operator_at_line_end | `true`, **`false`** | Place operators on the end of the previous line when splitting lines. +dfmt_space_after_cast | **`true`**, `false` | Insert space after the closing paren of a `cast` expression. +dfmt_space_after_keywords (Not yet implemented) | **`true`**, `false` | Insert space after `if`, `while`, `foreach`, etc, and before the `(`. +dfmt_space_before_function_parameters | `true`, **`false`** | Insert space before the opening paren of a function parameter list. +dfmt_selective_import_space | **`true`**, `false` | Insert space after the module name and before the `:` for selective imports. +dfmt_compact_labeled_statements | **`true`**, `false` | Place labels on the same line as the labeled `switch`, `for`, `foreach`, or `while` statement. +dfmt_template_constraint_style | **`conditional_newline_indent`** `conditional_newline` `always_newline` `always_newline_indent` | Control the formatting of template constraints. +dfmt_single_template_constraint_indent | `true`, **`false`** | Set if the constraints are indented by a single tab instead of two. Has only an effect if the style set to `always_newline_indent` or `conditional_newline_indent`. +dfmt_space_before_aa_colon | `true`, **`false`** | Adds a space after an associative array key before the `:` like in older dfmt versions. +dfmt_keep_line_breaks | `true`, **`false`** | Keep existing line breaks if these don't violate other formatting rules. +dfmt_single_indent | `true`, **`false`** | Set if the code in parens is indented by a single tab instead of two. ## Terminology * Braces - `{` and `}` diff --git a/appveyor.yml b/appveyor.yml index 0efb6ac..20eb3ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,6 +24,7 @@ skip_tags: false branches: only: - master + - /^v\d+\.\d+\.\d+([+-]\S*)*$/ install: - ps: function ResolveLatestDMD diff --git a/beaver b/beaver deleted file mode 160000 index 82f8c8f..0000000 --- a/beaver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82f8c8f6bbd9f0fbd9753a134377bec134a5956c diff --git a/beaver.Dockerfile b/beaver.Dockerfile deleted file mode 100644 index 8fc905b..0000000 --- a/beaver.Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright sociomantic labs GmbH 2017. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -FROM sociomantictsunami/dlang:v4 diff --git a/d-test-utils b/d-test-utils new file mode 160000 index 0000000..206a2e6 --- /dev/null +++ b/d-test-utils @@ -0,0 +1 @@ +Subproject commit 206a2e6abd97b4462f3a320e4f2d23986fad3cff diff --git a/dub.json b/dub.json index 65bcaf5..edaa129 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.9.10" + "libdparse": ">=0.14.0 <1.0.0" }, "targetPath" : "bin/", "targetName" : "dfmt", @@ -15,6 +15,6 @@ "built_with_dub" ], "preGenerateCommands" : [ - "rdmd --eval=\"auto dir=environment.get(\\\"DUB_PACKAGE_DIR\\\"); dir.buildPath(\\\"bin\\\").mkdirRecurse; auto gitVer = (\\\"git -C \\\"~dir~\\\" describe --tags\\\").executeShell; (gitVer.status == 0 ? gitVer.output.strip : \\\"v\\\" ~ dir.dirName.baseName.findSplitAfter(environment.get(\\\"DUB_ROOT_PACKAGE\\\")~\\\"-\\\")[1]).ifThrown(\\\"0.0.0\\\").chain(newline).to!string.toFile(dir.buildPath(\\\"bin\\\", \\\"dubhash.txt\\\"));\"" + "rdmd \"$PACKAGE_DIR/dubhash.d\"" ] } diff --git a/dubhash.d b/dubhash.d new file mode 100644 index 0000000..7f11ca5 --- /dev/null +++ b/dubhash.d @@ -0,0 +1,23 @@ +import std.algorithm; +import std.ascii; +import std.conv; +import std.exception; +import std.file; +import std.path; +import std.process; +import std.range; +import std.string; + +void main() +{ + auto dir = environment.get("DUB_PACKAGE_DIR"); + auto hashFile = dir.buildPath("bin", "dubhash.txt"); + auto gitVer = executeShell("git -C " ~ dir ~ " describe --tags"); + auto ver = (gitVer.status == 0 ? gitVer.output.strip + : "v" ~ dir.dirName.baseName.findSplitAfter( + environment.get("DUB_ROOT_PACKAGE") ~ "-")[1]).ifThrown("0.0.0") + .chain(newline).to!string.strip; + dir.buildPath("bin").mkdirRecurse; + if (!hashFile.exists || ver != hashFile.readText.strip) + hashFile.write(ver); +} diff --git a/libdparse b/libdparse index f8460d0..7112880 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit f8460d0d3581bebd41ee8629bd3e253c94c8a387 +Subproject commit 7112880dae3f25553d96dae53a445c16261de7f9 diff --git a/makd b/makd deleted file mode 160000 index d735c1d..0000000 --- a/makd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d735c1df67399693f699f8315418173a55de5313 diff --git a/makefile b/makefile index 9a2ca55..1227910 100644 --- a/makefile +++ b/makefile @@ -8,6 +8,9 @@ DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS) DMD_TEST_FLAGS := -unittest -g $(DMD_COMMON_FLAGS) LDC_FLAGS := -g -w -oq $(INCLUDE_PATHS) GDC_FLAGS := -g -w -oq $(INCLUDE_PATHS) +override DMD_FLAGS += $(DFLAGS) +override LDC_FLAGS += $(DFLAGS) +override GDC_FLAGS += $(DFLAGS) DC ?= dmd LDC ?= ldc2 GDC ?= gdc diff --git a/pkg/dfmt.pkg b/pkg/dfmt.pkg deleted file mode 100644 index 94d5b38..0000000 --- a/pkg/dfmt.pkg +++ /dev/null @@ -1,31 +0,0 @@ -# dfmt packaging configuration -# ============================ - -dfmt_bindir='bin' - -#------------------------------------------------------------------------------- -# Define the keyword arguments to pass to fpm (via the OPTS dict) -#------------------------------------------------------------------------------- - -OPTS.update( - name = "dfmt", - url = 'https://github.com/dlang-community/dfmt', - maintainer = 'Stefan Koch ', - vendor = 'Sociomantic Labs GmbH', - provides = "dfmt", - description = '''\ -D source code formatter -''', - depends = FUN.autodeps('dfmt', path=dfmt_bindir), -) - -#------------------------------------------------------------------------------- -# Define the positional arguments to pass to fpm (via the ARGS list) -#------------------------------------------------------------------------------- - -ARGS.extend(FUN.mapfiles(dfmt_bindir, '/usr/bin', 'dfmt')) -ARGS.extend([ - 'bash-completion/completions/dfmt=/usr/share/bash-completion/completions/dfmt' -]) - -# vim: set ft=python tw=80 : diff --git a/release-windows.sh b/release-windows.sh index 956982a..49ce3a5 100755 --- a/release-windows.sh +++ b/release-windows.sh @@ -1,26 +1,21 @@ #!/usr/bin/env bash -# Build the Windows binaries under Linux (requires wine) +# Build the Windows binaries under Linux set -eux -o pipefail -VERSION=$(git describe --abbrev=0 --tags) -OS=windows -ARCH_SUFFIX="x86" + +BIN_NAME=dfmt # Allow the script to be run from anywhere DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -# Step 1: download the DMD binaries -if [ ! -d dmd2 ] ; then - wget http://downloads.dlang.org/releases/2.x/2.079.0/dmd.2.079.0.windows.7z - 7z x dmd.2.079.0.windows.7z > /dev/null -fi +source setup-ldc-windows.sh -# Step 2: Run DMD via wineconsole -archiveName="dfmt-$VERSION-$OS-$ARCH_SUFFIX.zip" +# Run LDC with cross-compilation +archiveName="$BIN_NAME-$VERSION-$OS-$ARCH_SUFFIX.zip" echo "Building $archiveName" mkdir -p bin -git describe --tags > bin/githash.txt # no git installed under Wine -DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat +DC=ldmd2 make ldc cd bin -zip "$archiveName" dfmt.exe +mv "${BIN_NAME}" "${BIN_NAME}.exe" +zip "$archiveName" "${BIN_NAME}.exe" diff --git a/setup-ldc-windows.sh b/setup-ldc-windows.sh new file mode 100644 index 0000000..0656b5a --- /dev/null +++ b/setup-ldc-windows.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +# sets up LDC for cross-compilation. Source this script, s.t. the new LDC is in PATH + +LDC_VERSION="1.13.0" +ARCH=${ARCH:-32} +VERSION=$(git describe --abbrev=0 --tags) +OS=windows + +# Step 0: install ldc +if [ ! -f install.sh ] ; then + wget https://dlang.org/install.sh +fi +. $(bash ./install.sh -a "ldc-${LDC_VERSION}") + +# for the install.sh script only +LDC_PATH="$(dirname $(dirname $(which ldc2)))" + +# Step 1a: download the LDC x64 windows binaries +if [ "${ARCH}" == 64 ] && [ ! -d "ldc2-${LDC_VERSION}-windows-x64" ] ; then + wget "https://github.com/ldc-developers/ldc/releases/download/v1.13.0/ldc2-${LDC_VERSION}-windows-x64.7z" + 7z x "ldc2-${LDC_VERSION}-windows-x64.7z" > /dev/null + # Step 2a: Add LDC windows binaries to LDC Linux + if [ ! -d "${LDC_PATH}/lib-win64" ] ; then + cp -r ldc2-1.13.0-windows-x64/lib "${LDC_PATH}/lib-win64" + cat >> "$LDC_PATH"/etc/ldc2.conf < /dev/null + # Step 2b: Add LDC windows binaries to LDC Linux + if [ ! -d "${LDC_PATH}/lib-win32" ] ; then + cp -r ldc2-1.13.0-windows-x86/lib "${LDC_PATH}/lib-win32" + cat >> "$LDC_PATH"/etc/ldc2.conf < a.endLocation < b.endLocation) (indentInfoSortedByEndLocation); + sort!((a,b) => a.endLocation < b.endLocation) + (structInfoSortedByEndLocation); sort(ufcsHintLocations); ufcsHintLocations = ufcsHintLocations.uniq().array(); } @@ -86,6 +95,12 @@ struct ASTInformation /// Closing braces of function literals size_t[] funLitEndLocations; + /// Locations of aggregate bodies (struct, class, union) + size_t[] aggregateBodyLocations; + + /// Locations of function bodies + size_t[] funBodyLocations; + /// Conditional statements that have matching "else" statements size_t[] conditionalWithElseLocations; @@ -95,6 +110,9 @@ struct ASTInformation /// Locations of start locations of array initializers size_t[] arrayStartLocations; + /// Locations of start locations of associative array initializers + size_t[] assocArrayStartLocations; + /// Locations of "in" and "out" tokens that begin contracts size_t[] contractLocations; @@ -114,6 +132,9 @@ struct ASTInformation size_t[] ufcsHintLocations; BraceIndentInfo[] indentInfoSortedByEndLocation; + + /// Opening & closing braces of struct initializers + StructInitializerInfo[] structInfoSortedByEndLocation; } /// Collects information from the AST that is useful for the formatter @@ -136,6 +157,19 @@ final class FormatVisitor : ASTVisitor arrayInitializer.accept(this); } + override void visit(const ArrayLiteral arrayLiteral) + { + astInformation.arrayStartLocations ~= arrayLiteral.tokens[0].index; + arrayLiteral.accept(this); + } + + override void visit(const AssocArrayLiteral assocArrayLiteral) + { + astInformation.arrayStartLocations ~= assocArrayLiteral.tokens[0].index; + astInformation.assocArrayStartLocations ~= assocArrayLiteral.tokens[0].index; + assocArrayLiteral.accept(this); + } + override void visit (const SharedStaticConstructor sharedStaticConstructor) { astInformation.sharedStaticConstructorDestructorLocations ~= sharedStaticConstructor.location; @@ -172,6 +206,18 @@ final class FormatVisitor : ASTVisitor destructor.accept(this); } + override void visit (const FunctionBody functionBody) + { + if (auto bd = functionBody.specifiedFunctionBody) + { + if (bd.blockStatement) + { + astInformation.funBodyLocations ~= bd.blockStatement.startLocation; + } + } + functionBody.accept(this); + } + override void visit(const ConditionalDeclaration dec) { if (dec.hasElse) @@ -214,9 +260,9 @@ final class FormatVisitor : ASTVisitor override void visit(const FunctionLiteralExpression funcLit) { - if (funcLit.functionBody !is null) + if (funcLit.specifiedFunctionBody !is null) { - const bs = funcLit.functionBody.blockStatement; + const bs = funcLit.specifiedFunctionBody.blockStatement; astInformation.funLitStartLocations ~= bs.startLocation; astInformation.funLitEndLocations ~= bs.endLocation; @@ -244,21 +290,19 @@ final class FormatVisitor : ASTVisitor caseRangeStatement.accept(this); } - override void visit(const FunctionBody functionBody) + override void visit(const SpecifiedFunctionBody specifiedFunctionBody) { - if (functionBody.blockStatement !is null) - astInformation.doubleNewlineLocations ~= functionBody.blockStatement.endLocation; - if (functionBody.bodyStatement !is null && functionBody.bodyStatement - .blockStatement !is null) - astInformation.doubleNewlineLocations - ~= functionBody.bodyStatement.blockStatement.endLocation; - functionBody.accept(this); + if (specifiedFunctionBody.blockStatement !is null) + astInformation.doubleNewlineLocations ~= specifiedFunctionBody.blockStatement.endLocation; + specifiedFunctionBody.accept(this); } override void visit(const StructInitializer structInitializer) { astInformation.structInitStartLocations ~= structInitializer.startLocation; astInformation.structInitEndLocations ~= structInitializer.endLocation; + astInformation.structInfoSortedByEndLocation ~= + StructInitializerInfo(structInitializer.startLocation, structInitializer.endLocation); astInformation.indentInfoSortedByEndLocation ~= BraceIndentInfo(structInitializer.startLocation, structInitializer.endLocation); @@ -279,12 +323,15 @@ final class FormatVisitor : ASTVisitor override void visit(const Invariant invariant_) { - astInformation.doubleNewlineLocations ~= invariant_.blockStatement.endLocation; + if (invariant_.blockStatement !is null) + astInformation.doubleNewlineLocations ~= invariant_.blockStatement.endLocation; + invariant_.accept(this); } override void visit(const StructBody structBody) { + astInformation.aggregateBodyLocations ~= structBody.startLocation; astInformation.doubleNewlineLocations ~= structBody.endLocation; structBody.accept(this); } @@ -367,12 +414,24 @@ final class FormatVisitor : ASTVisitor storageClass.accept(this); } + override void visit(const InContractExpression inContractExpression) + { + astInformation.contractLocations ~= inContractExpression.inTokenLocation; + inContractExpression.accept(this); + } + override void visit(const InStatement inStatement) { astInformation.contractLocations ~= inStatement.inTokenLocation; inStatement.accept(this); } + override void visit(const OutContractExpression outContractExpression) + { + astInformation.contractLocations ~= outContractExpression.outTokenLocation; + outContractExpression.accept(this); + } + override void visit(const OutStatement outStatement) { astInformation.contractLocations ~= outStatement.outTokenLocation; diff --git a/src/dfmt/config.d b/src/dfmt/config.d index a9e59a3..b2e49ed 100644 --- a/src/dfmt/config.d +++ b/src/dfmt/config.d @@ -16,7 +16,9 @@ enum BraceStyle /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS) otbs, /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Variant:_Stroustrup) - stroustrup + stroustrup, + /// $(LINK https://en.wikipedia.org/wiki/Indentation_style#K&R_style) + knr, } enum TemplateConstraintStyle @@ -55,6 +57,12 @@ struct Config TemplateConstraintStyle dfmt_template_constraint_style; /// OptionalBoolean dfmt_single_template_constraint_indent; + /// + OptionalBoolean dfmt_space_before_aa_colon; + /// + OptionalBoolean dfmt_keep_line_breaks; + /// + OptionalBoolean dfmt_single_indent; mixin StandardEditorConfigFields; @@ -82,6 +90,9 @@ struct Config dfmt_compact_labeled_statements = OptionalBoolean.t; dfmt_template_constraint_style = TemplateConstraintStyle.conditional_newline_indent; dfmt_single_template_constraint_indent = OptionalBoolean.f; + dfmt_space_before_aa_colon = OptionalBoolean.f; + dfmt_keep_line_breaks = OptionalBoolean.f; + dfmt_single_indent = OptionalBoolean.f; } /** diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 19b5312..acd4724 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -9,14 +9,25 @@ module dfmt.formatter; import dparse.lexer; import dparse.parser; import dparse.rollback_allocator; -import dfmt.config; import dfmt.ast_info; +import dfmt.config; import dfmt.indentation; import dfmt.tokens; import dfmt.wrapping; import std.array; +import std.algorithm.comparison : among; -void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, +/** + * Formats the code contained in `buffer` into `output`. + * Params: + * source_desc = A description of where `buffer` came from. Usually a file name. + * buffer = The raw source code. + * output = The output range that will have the formatted code written to it. + * formatterConfig = Formatter configuration. + * Returns: `true` if the formatting succeeded, `false` of a lexing error. This + * function can return `true` if parsing failed. + */ +bool format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, Config* formatterConfig) { LexerConfig config; @@ -33,11 +44,18 @@ void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, auto visitor = new FormatVisitor(&astInformation); visitor.visit(mod); astInformation.cleanup(); - auto tokens = byToken(buffer, config, &cache).array(); + auto tokenRange = byToken(buffer, config, &cache); + auto app = appender!(Token[])(); + for (; !tokenRange.empty(); tokenRange.popFront()) + app.put(tokenRange.front()); + auto tokens = app.data; + if (!tokenRange.messages.empty) + return false; auto depths = generateDepthInfo(tokens); auto tokenFormatter = TokenFormatter!OutputRange(buffer, tokens, depths, output, &astInformation, formatterConfig); tokenFormatter.format(); + return true; } immutable(short[]) generateDepthInfo(const Token[] tokens) pure nothrow @trusted @@ -93,6 +111,7 @@ struct TokenFormatter(OutputRange) this.output = output; this.astInformation = astInformation; this.config = config; + this.indents = IndentStack(config); { auto eol = config.end_of_line; @@ -110,7 +129,7 @@ struct TokenFormatter(OutputRange) /// Runs the formatting process void format() { - while (index < tokens.length) + while (hasCurrent) formatStep(); } @@ -181,7 +200,7 @@ private: { import std.range : assumeSorted; - assert(index < tokens.length); + assert(hasCurrent); if (currentIs(tok!"comment")) { formatComment(); @@ -190,11 +209,13 @@ private: || isNumberLiteral(current.type) || currentIs(tok!"characterLiteral")) { writeToken(); - if (index < tokens.length) + if (hasCurrent) { immutable t = tokens[index].type; if (t == tok!"identifier" || isStringLiteral(t) - || isNumberLiteral(t) || t == tok!"characterLiteral") + || isNumberLiteral(t) || t == tok!"characterLiteral" + // a!"b" function() + || t == tok!"function" || t == tok!"delegate") write(" "); } } @@ -205,7 +226,9 @@ private: else if (currentIs(tok!"return")) { writeToken(); - if (!currentIs(tok!";") && !currentIs(tok!")")) + if (!currentIs(tok!";") && !currentIs(tok!")") && !currentIs(tok!"{") + && !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"do") + && (hasCurrent && tokens[index].text != "body")) write(" "); } else if (currentIs(tok!"with")) @@ -232,6 +255,18 @@ private: { writeToken(); write(" "); + while (hasCurrent) + { + if (currentIs(tok!"(")) + formatLeftParenOrBracket(); + else if (currentIs(tok!")")) + { + formatRightParen(); + break; + } + else + writeToken(); + } } else if (((isBlockHeader() || currentIs(tok!"version")) && peekIs(tok!"(")) || (currentIs(tok!"debug") && peekIs(tok!"{"))) @@ -241,6 +276,10 @@ private: else formatBlockHeader(); } + else if ((current.text == "body" || current == tok!"do") && peekBackIsFunctionDeclarationEnding()) + { + formatKeyword(); + } else if (currentIs(tok!"do")) { formatBlockHeader(); @@ -252,14 +291,14 @@ private: else if (currentIs(tok!"asm")) { formatKeyword(); - while (index < tokens.length && !currentIs(tok!"{")) + while (hasCurrent && !currentIs(tok!"{")) formatStep(); - if (index < tokens.length) + if (hasCurrent) { int depth = 1; formatStep(); inAsm = true; - while (index < tokens.length && depth > 0) + while (hasCurrent && depth > 0) { if (currentIs(tok!"{")) ++depth; @@ -288,10 +327,6 @@ private: inlineElse = true; formatKeyword(); } - else if (current.text == "body" && peekBackIsFunctionDeclarationEnding()) - { - formatKeyword(); - } else if (isBasicType(current.type)) { writeToken(); @@ -306,7 +341,7 @@ private: { writeToken(); //dfmt off - if (index < tokens.length && ( currentIs(tok!"identifier") + if (hasCurrent && ( currentIs(tok!"identifier") || ( index > 1 && config.dfmt_space_before_function_parameters && ( isBasicType(peekBack(2).type) || peekBack2Is(tok!"identifier") @@ -436,8 +471,13 @@ private: write(" "); else if (prevTokenEndLine == currTokenLine || (t == tok!")" && peekIs(tok!"{"))) write(" "); + else if (peekBackIsOneOf(false, tok!"else", tok!"identifier")) + write(" "); else if (canAddNewline || (peekIs(tok!"{") && t == tok!"}")) newline(); + + if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!"))) + pushWrapIndent(tok!"("); } writeToken(); immutable j = justAddedExtraNewline; @@ -446,9 +486,9 @@ private: newline(); justAddedExtraNewline = j; } - else if (index < tokens.length) + else if (hasCurrent) { - if (index < tokens.length && prevTokenEndLine == tokens[index].line) + if (prevTokenEndLine == tokens[index].line) { if (currentIs(tok!"}")) { @@ -459,7 +499,7 @@ private: else if (!currentIs(tok!"{")) write(" "); } - else if (!currentIs(tok!"{")) + else if (!currentIs(tok!"{") && !currentIs(tok!"in") && !currentIs(tok!"out")) { if (currentIs(tok!")") && indents.topIs(tok!",")) indents.pop(); @@ -483,7 +523,7 @@ private: return; } write(" "); - while (index < tokens.length) + while (hasCurrent) { if (currentIs(tok!";")) { @@ -548,8 +588,10 @@ private: { assert(currentIs(tok!"(") || currentIs(tok!"[")); } - body + do { + import dfmt.editorconfig : OptionalBoolean; + immutable p = current.type; regenLineBreakHintsIfNecessary(index); writeToken(); @@ -569,25 +611,90 @@ private: // No heuristics apply if we can't look before the opening paren/bracket if (index < 1) return; - immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0 + immutable bool arrayInitializerStart = p == tok!"[" && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); - if (arrayInitializerStart) + + if (arrayInitializerStart && isMultilineAt(index - 1)) { + if (peekBack2Is(tok!"(")) { + indents.pop(); + } + // Use the close bracket as the indent token to distinguish // the array initialiazer from an array index in the newline // handling code - pushWrapIndent(tok!"]"); + IndentStack.Details detail; + detail.wrap = false; + detail.temp = false; + + // wrap and temp are set manually to the values it would actually + // receive here because we want to set breakEveryItem for the ] token to know if + // we should definitely always new-line after every comma for a big AA + detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex( + tokens[index - 1].index); + detail.preferLongBreaking = true; + + indents.push(tok!"]", detail); newline(); immutable size_t j = expressionEndIndex(index); linebreakHints = chooseLineBreakTokens(index, tokens[index .. j], depths[index .. j], config, currentLineLength, indentLevel); } + else if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t) + { + if (peekBack2Is(tok!"(")) { + indents.pop(); + } + IndentStack.Details detail; + + detail.wrap = false; + detail.temp = false; + detail.breakEveryItem = false; + detail.mini = tokens[index].line == tokens[index - 1].line; + + indents.push(tok!"]", detail); + if (!detail.mini) + { + newline(); + } + } + else if (arrayInitializerStart) + { + // This is a short (non-breaking) array/AA value + IndentStack.Details detail; + detail.wrap = false; + detail.temp = false; + + detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); + // array of (possibly associative) array, let's put each item on its own line + if (!detail.breakEveryItem && currentIs(tok!"[")) + detail.breakEveryItem = true; + + // the '[' is immediately followed by an item instead of a newline here so + // we set mini, that the ']' also follows an item immediately without newline. + detail.mini = true; + + indents.push(tok!"]", detail); + } + else if (p == tok!"[") + { + // array item access + IndentStack.Details detail; + detail.wrap = false; + detail.temp = true; + detail.mini = true; + indents.push(tok!"]", detail); + } else if (!currentIs(tok!")") && !currentIs(tok!"]") && (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) { newline(); } + else if (onNextLine) + { + newline(); + } } void formatRightParen() @@ -595,7 +702,7 @@ private: { assert(currentIs(tok!")")); } - body + do { parenDepth--; indents.popWrapIndents(); @@ -604,6 +711,10 @@ private: if (indents.topIs(tok!"(")) indents.pop(); + if (onNextLine) + { + newline(); + } if (parenDepth == 0 && (peekIs(tok!"is") || peekIs(tok!"in") || peekIs(tok!"out") || peekIs(tok!"do") || peekIsBody)) { @@ -613,18 +724,38 @@ private: { writeToken(); if (spaceAfterParens || parenDepth > 0) - write(" "); + writeSpace(); } else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens && !peekIs(tok!"in") && !peekIs(tok!"is") && !peekIs(tok!"if")) { writeToken(); - write(" "); + writeSpace(); } else writeToken(); } + void formatRightBracket() + in + { + assert(currentIs(tok!"]")); + } + do + { + indents.popWrapIndents(); + if (indents.topIs(tok!"]")) + { + if (!indents.topDetails.mini && !indents.topDetails.temp) + newline(); + else + indents.pop(); + } + writeToken(); + if (currentIs(tok!"identifier")) + write(" "); + } + void formatAt() { immutable size_t atIndex = tokens[index].index; @@ -636,26 +767,35 @@ private: writeParens(false); if (tokens[index].type == tok!"{") return; - if (index < tokens.length && tokens[index - 1].line < tokens[index].line + + if (hasCurrent && tokens[index - 1].line < tokens[index].line && astInformation.atAttributeStartLocations.canFindIndex(atIndex)) newline(); else write(" "); } - else if (index < tokens.length && (currentIs(tok!"@") + else if (hasCurrent && (currentIs(tok!"@") || isBasicType(tokens[index].type) + || currentIs(tok!"invariant") + || currentIs(tok!"extern") || currentIs(tok!"identifier")) && !currentIsIndentedTemplateConstraint()) - write(" "); + { + writeSpace(); + } } void formatColon() { import dfmt.editorconfig : OptionalBoolean; + import std.algorithm : canFind, any; immutable bool isCase = astInformation.caseEndLocations.canFindIndex(current.index); immutable bool isAttribute = astInformation.attributeDeclarationLines.canFindIndex( current.line); + immutable bool isStructInitializer = astInformation.structInfoSortedByEndLocation + .canFind!(st => st.startLocation < current.index && current.index < st.endLocation); + if (isCase || isAttribute) { writeToken(); @@ -670,12 +810,20 @@ private: newline(); } } - else if (peekBackIs(tok!"identifier") && (peekBack2Is(tok!"{", true) - || peekBack2Is(tok!"}", true) || peekBack2Is(tok!";", true) - || peekBack2Is(tok!":", true)) && !(isBlockHeader(1) && !peekIs(tok!"if"))) + else if (indents.topIs(tok!"]")) // Associative array + { + write(config.dfmt_space_before_aa_colon ? " : " : ": "); + ++index; + } + else if (peekBackIs(tok!"identifier") + && [tok!"{", tok!"}", tok!";", tok!":", tok!","] + .any!((ptrdiff_t token) => peekBack2Is(cast(IdType)token, true)) + && (!isBlockHeader(1) || peekIs(tok!"if"))) { writeToken(); - if (!currentIs(tok!"{")) + if (isStructInitializer) + write(" "); + else if (!currentIs(tok!"{")) newline(); } else @@ -765,11 +913,9 @@ private: if (astInformation.structInitStartLocations.canFindIndex(tIndex)) { sBraceDepth++; - auto e = expressionEndIndex(index); - immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)) - .sum(); + immutable bool multiline = isMultilineAt(index); writeToken(); - if (l > config.dfmt_soft_max_line_length) + if (multiline) { import std.algorithm.searching : find; @@ -787,15 +933,12 @@ private: } else if (astInformation.funLitStartLocations.canFindIndex(tIndex)) { + indents.popWrapIndents(); + sBraceDepth++; if (peekBackIsOneOf(true, tok!")", tok!"identifier")) write(" "); - auto e = expressionEndIndex(index); - immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)) - .sum(); - immutable bool multiline = l > config.dfmt_soft_max_line_length - || tokens[index .. e].canFind!(a => a.type == tok!"comment" - || isBlockHeaderToken(a.type))(); + immutable bool multiline = isMultilineAt(index); writeToken(); if (multiline) { @@ -805,7 +948,8 @@ private: else { niBraceDepth++; - write(" "); + if (!currentIs(tok!"}")) + write(" "); } } else @@ -828,6 +972,10 @@ private: if (config.dfmt_brace_style == BraceStyle.allman || peekBackIsOneOf(true, tok!"{", tok!"}")) newline(); + else if (config.dfmt_brace_style == BraceStyle.knr + && astInformation.funBodyLocations.canFindIndex(tIndex) + && (peekBackIs(tok!")") || (!peekBackIs(tok!"do") && peekBack().text != "body"))) + newline(); else if (!peekBackIsOneOf(true, tok!"{", tok!"}", tok!";")) write(" "); writeToken(); @@ -872,7 +1020,7 @@ private: { if (niBraceDepth > 0) { - if (!peekBackIsSlashSlash()) + if (!peekBackIsSlashSlash() && !peekBackIs(tok!"{")) write(" "); niBraceDepth--; } @@ -896,7 +1044,7 @@ private: currentLineLength = 0; justAddedExtraNewline = true; } - if (config.dfmt_brace_style == BraceStyle.otbs + if (config.dfmt_brace_style.among(BraceStyle.otbs, BraceStyle.knr) && ((peekIs(tok!"else") && !indents.topAre(tok!"static", tok!"if") && !indents.topIs(tok!"foreach") && !indents.topIs(tok!"for") @@ -956,46 +1104,51 @@ private: indents.push(current.type); } writeToken(); + if (currentIs(tok!"(")) { write(" "); writeParens(false); } - if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch"))) - write(" "); - else if (currentIs(tok!"comment")) - formatStep(); - else if (!shouldPushIndent) + + if (hasCurrent) { - if (!currentIs(tok!"{") && !currentIs(tok!";")) + if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch"))) write(" "); - } - else if (!currentIs(tok!"{") && !currentIs(tok!";") && !currentIs(tok!"in") && - !currentIs(tok!"out") && !currentIs(tok!"do") && current.text != "body") - { - newline(); - } - else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"if")) - { - // Hacks to format braced vs non-braced static if declarations. - indents.pop(); - indents.pop(); - indents.push(tok!"if"); - formatLeftBrace(); - } - else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach")) - { - indents.pop(); - indents.pop(); - indents.push(tok!"foreach"); - formatLeftBrace(); - } - else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach_reverse")) - { - indents.pop(); - indents.pop(); - indents.push(tok!"foreach_reverse"); - formatLeftBrace(); + else if (currentIs(tok!"comment")) + formatStep(); + else if (!shouldPushIndent) + { + if (!currentIs(tok!"{") && !currentIs(tok!";")) + write(" "); + } + else if (hasCurrent && !currentIs(tok!"{") && !currentIs(tok!";") && !currentIs(tok!"in") && + !currentIs(tok!"out") && !currentIs(tok!"do") && current.text != "body") + { + newline(); + } + else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"if")) + { + // Hacks to format braced vs non-braced static if declarations. + indents.pop(); + indents.pop(); + indents.push(tok!"if"); + formatLeftBrace(); + } + else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach")) + { + indents.pop(); + indents.pop(); + indents.push(tok!"foreach"); + formatLeftBrace(); + } + else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach_reverse")) + { + indents.pop(); + indents.pop(); + indents.push(tok!"foreach_reverse"); + formatLeftBrace(); + } } } @@ -1048,13 +1201,15 @@ private: writeParens(config.dfmt_space_after_cast == OptionalBoolean.t); break; case tok!"out": - if (!peekBackIs(tok!"}") - && astInformation.contractLocations.canFindIndex(current.index)) - newline(); - else if (peekBackIsKeyword) - write(" "); + if (!peekBackIsSlashSlash) { + if (!peekBackIs(tok!"}") + && astInformation.contractLocations.canFindIndex(current.index)) + newline(); + else if (peekBackIsKeyword) + write(" "); + } writeToken(); - if (!currentIs(tok!"(") && !currentIs(tok!"{") && !currentIs(tok!"comment")) + if (!currentIs(tok!"{") && !currentIs(tok!"comment")) write(" "); break; case tok!"try": @@ -1076,19 +1231,21 @@ private: break; case tok!"in": immutable isContract = astInformation.contractLocations.canFindIndex(current.index); - if (isContract) - { - indents.popTempIndents(); - newline(); + if (!peekBackIsSlashSlash) { + if (isContract) + { + indents.popTempIndents(); + newline(); + } + else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!")) + write(" "); } - else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!")) - write(" "); writeToken(); immutable isFunctionLit = astInformation.funLitStartLocations.canFindIndex( current.index); if (isFunctionLit && config.dfmt_brace_style == BraceStyle.allman) newline(); - else if (!isContract) + else if (!isContract || currentIs(tok!"(")) write(" "); break; case tok!"is": @@ -1137,19 +1294,30 @@ private: } } goto default; + case tok!"invariant": + writeToken(); + if (currentIs(tok!"(")) + write(" "); + break; default: if (peekBackIs(tok!"identifier")) - write(" "); + { + writeSpace(); + } if (index + 1 < tokens.length) { if (!peekIs(tok!"@") && (peekIsOperator() || peekIs(tok!"out") || peekIs(tok!"in"))) + { writeToken(); + } else { writeToken(); if (!currentIsIndentedTemplateConstraint()) - write(" "); + { + writeSpace(); + } } } else @@ -1160,7 +1328,7 @@ private: bool currentIsIndentedTemplateConstraint() { - return index < tokens.length + return hasCurrent && astInformation.constraintLocations.canFindIndex(current.index) && (config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline || config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline_indent @@ -1169,6 +1337,7 @@ private: void formatOperator() { + import dfmt.editorconfig : OptionalBoolean; import std.algorithm : canFind; switch (current.type) @@ -1238,12 +1407,7 @@ private: formatColon(); break; case tok!"]": - indents.popWrapIndents(); - if (indents.topIs(tok!"]")) - newline(); - writeToken(); - if (currentIs(tok!"identifier")) - write(" "); + formatRightBracket(); break; case tok!";": formatSemicolon(); @@ -1257,12 +1421,13 @@ private: case tok!".": regenLineBreakHintsIfNecessary(index); immutable bool ufcsWrap = astInformation.ufcsHintLocations.canFindIndex(current.index); - if (ufcsWrap || linebreakHints.canFind(index) || (linebreakHints.length == 0 - && currentLineLength + nextTokenLength() > config.max_line_length)) + if (ufcsWrap || linebreakHints.canFind(index) || onNextLine + || (linebreakHints.length == 0 && currentLineLength + nextTokenLength() > config.max_line_length)) { pushWrapIndent(); - newline(); - if (ufcsWrap) + if (!peekBackIs(tok!"comment")) + newline(); + if (ufcsWrap || onNextLine) regenLineBreakHints(index); } writeToken(); @@ -1314,7 +1479,40 @@ private: case tok!"%": binary: immutable bool isWrapToken = linebreakHints.canFind(index); - if (config.dfmt_split_operator_at_line_end) + if (config.dfmt_keep_line_breaks == OptionalBoolean.t && index > 0) + { + const operatorLine = tokens[index].line; + const rightOperandLine = tokens[index + 1].line; + + if (tokens[index - 1].line < operatorLine) + { + if (!indents.topIs(tok!"enum")) + pushWrapIndent(); + if (!peekBackIs(tok!"comment")) + newline(); + } + else + { + write(" "); + } + if (rightOperandLine > operatorLine + && !indents.topIs(tok!"enum")) + { + pushWrapIndent(); + } + writeToken(); + + if (rightOperandLine > operatorLine) + { + if (!peekBackIs(tok!"comment")) + newline(); + } + else + { + write(" "); + } + } + else if (config.dfmt_split_operator_at_line_end) { if (isWrapToken) { @@ -1358,15 +1556,51 @@ private: void formatComma() { + import dfmt.editorconfig : OptionalBoolean; import std.algorithm : canFind; - regenLineBreakHintsIfNecessary(index); + if (config.dfmt_keep_line_breaks == OptionalBoolean.f) + regenLineBreakHintsIfNecessary(index); if (indents.indentToMostRecent(tok!"enum") != -1 && !peekIs(tok!"}") && indents.topIs(tok!"{") && parenDepth == 0) { writeToken(); newline(); } + else if (indents.topIs(tok!"]") && indents.topDetails.breakEveryItem + && !indents.topDetails.mini) + { + writeToken(); + newline(); + regenLineBreakHints(index - 1); + } + else if (indents.topIs(tok!"]") && indents.topDetails.preferLongBreaking + && !currentIs(tok!")") && !currentIs(tok!"]") && !currentIs(tok!"}") + && !currentIs(tok!"comment") && index + 1 < tokens.length + && isMultilineAt(index + 1, true)) + { + writeToken(); + newline(); + regenLineBreakHints(index - 1); + } + else if (config.dfmt_keep_line_breaks == OptionalBoolean.t) + { + const commaLine = tokens[index].line; + + writeToken(); + if (!currentIs(tok!")") && !currentIs(tok!"]") + && !currentIs(tok!"}") && !currentIs(tok!"comment")) + { + if (tokens[index].line == commaLine) + { + write(" "); + } + else + { + newline(); + } + } + } else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) { @@ -1390,16 +1624,21 @@ private: { import std.range : assumeSorted; import std.algorithm.comparison : min; - import std.algorithm.searching : countUntil; + import std.algorithm.searching : canFind, countUntil; // The end of the tokens considered by the line break algorithm is - // either the expression end index or the next mandatory line break, - // whichever is first. + // either the expression end index or the next mandatory line break + // or a newline inside a string literal, whichever is first. auto r = assumeSorted(astInformation.ufcsHintLocations).upperBound(tokens[i].index); immutable ufcsBreakLocation = r.empty ? size_t.max : tokens[i .. $].countUntil!(t => t.index == r.front) + i; - immutable size_t j = min(expressionEndIndex(i), ufcsBreakLocation); + immutable multilineStringLocation = tokens[i .. $] + .countUntil!(t => t.text.canFind('\n')); + immutable size_t j = min( + expressionEndIndex(i), + ufcsBreakLocation, + multilineStringLocation == -1 ? size_t.max : multilineStringLocation + i + 1); // Use magical negative value for array literals and wrap indents immutable inLvl = (indents.topIsWrap() || indents.topIs(tok!"]")) ? -indentLevel : indentLevel; @@ -1423,13 +1662,13 @@ private: void newline() { import std.range : assumeSorted; - import std.algorithm : max; + import std.algorithm : max, canFind; import dfmt.editorconfig : OptionalBoolean; if (currentIs(tok!"comment") && index > 0 && current.line == tokenEndLine(tokens[index - 1])) return; - immutable bool hasCurrent = index < tokens.length; + immutable bool hasCurrent = this.hasCurrent; if (niBraceDepth > 0 && !peekBackIsSlashSlash() && hasCurrent && tokens[index].type == tok!"}" && !assumeSorted(astInformation.funLitEndLocations).equalRange( @@ -1466,8 +1705,14 @@ private: immutable l = indents.indentToMostRecent(tok!"switch"); if (l != -1 && config.dfmt_align_switch_statements == OptionalBoolean.t) indentLevel = l; - else if (config.dfmt_compact_labeled_statements == OptionalBoolean.f - || !isBlockHeader(2) || peek2Is(tok!"if")) + else if (astInformation.structInfoSortedByEndLocation + .canFind!(st => st.startLocation < current.index && current.index < st.endLocation)) { + immutable l2 = indents.indentToMostRecent(tok!"{"); + assert(l2 != -1, "Recent '{' is not found despite being in struct initializer"); + indentLevel = l2 + 1; + } + else if ((config.dfmt_compact_labeled_statements == OptionalBoolean.f + || !isBlockHeader(2) || peek2Is(tok!"if")) && !indents.topIs(tok!"]")) { immutable l2 = indents.indentToMostRecent(tok!"{"); indentLevel = l2 != -1 ? l2 : indents.indentLevel - 1; @@ -1477,7 +1722,14 @@ private: } else if (currentIs(tok!"case") || currentIs(tok!"default")) { - if (peekBackIs(tok!"}", true) || peekBackIs(tok!";", true)) + + if (peekBackIs(tok!"}", true) || peekBackIs(tok!";", true) + /** + * The following code is valid and should be indented flatly + * case A: + * case B: + */ + || peekBackIs(tok!":", true)) { indents.popTempIndents(); if (indents.topIs(tok!"case")) @@ -1497,7 +1749,7 @@ private: else if (currentIs(tok!"{")) { indents.popWrapIndents(); - if (peekBackIsSlashSlash() && peekBack2Is(tok!";")) + if ((peekBackIsSlashSlash() && peekBack2Is(tok!";")) || indents.topIs(tok!"]")) { indents.popTempIndents(); indentLevel = indents.indentLevel; @@ -1594,7 +1846,11 @@ private: case tok!"wstringLiteral": case tok!"dstringLiteral": immutable o = current.text.retro().countUntil('\n'); - currentLineLength += o == -1 ? current.text.length : o; + if (o == -1) { + currentLineLength += current.text.length; + } else { + currentLineLength = cast(uint) o; + } break; default: currentLineLength += current.text.length; @@ -1609,12 +1865,13 @@ private: { assert(currentIs(tok!"("), str(current.type)); } - body + do { immutable int depth = parenDepth; immutable int startingNiBraceDepth = niBraceDepth; immutable int startingSBraceDepth = sBraceDepth; parenDepth = 0; + do { spaceAfterParens = spaceAfter; @@ -1637,7 +1894,8 @@ private: else formatStep(); } - while (index < tokens.length && parenDepth > 0); + while (hasCurrent && parenDepth > 0); + if (indents.topIs(tok!"!")) indents.pop(); parenDepth = depth; @@ -1670,20 +1928,41 @@ private: void pushWrapIndent(IdType type = tok!"") { immutable t = type == tok!"" ? tokens[index].type : type; + IndentStack.Details detail; + detail.wrap = isWrapIndent(t); + detail.temp = isTempIndent(t); + pushWrapIndent(t, detail); + } + + void pushWrapIndent(IdType type, IndentStack.Details detail) + { if (parenDepth == 0) { if (indents.wrapIndents == 0) - indents.push(t); + indents.push(type, detail); } else if (indents.wrapIndents < 1) - indents.push(t); + indents.push(type, detail); + } + + void writeSpace() + { + if (onNextLine) + { + newline(); + } + else + { + write(" "); + } } const pure @safe @nogc: - size_t expressionEndIndex(size_t i) nothrow + size_t expressionEndIndex(size_t i, bool matchComma = false) nothrow { immutable bool braces = i < tokens.length && tokens[i].type == tok!"{"; + immutable bool brackets = i < tokens.length && tokens[i].type == tok!"["; immutable d = depths[i]; while (true) { @@ -1691,13 +1970,27 @@ const pure @safe @nogc: break; if (depths[i] < d) break; - if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) + if (!braces && !brackets && matchComma && depths[i] == d && tokens[i].type == tok!",") + break; + if (!braces && !brackets && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) break; i++; } return i; } + /// Returns: true when the expression starting at index goes over the line length limit. + /// Uses matching `{}` or `[]` or otherwise takes everything up until a semicolon or opening brace using expressionEndIndex. + bool isMultilineAt(size_t i, bool matchComma = false) + { + import std.algorithm : map, sum, canFind; + + auto e = expressionEndIndex(i, matchComma); + immutable int l = currentLineLength + tokens[i .. e].map!(a => tokenLength(a)).sum(); + return l > config.dfmt_soft_max_line_length || tokens[i .. e].canFind!( + a => a.type == tok!"comment" || isBlockHeaderToken(a.type))(); + } + bool peekIsKeyword() nothrow { return index + 1 < tokens.length && isKeyword(tokens[index + 1].type); @@ -1726,12 +2019,17 @@ const pure @safe @nogc: return tokenLength(tokens[i]); } + bool hasCurrent() nothrow const + { + return index < tokens.length; + } + ref current() nothrow in { - assert(index < tokens.length); + assert(hasCurrent); } - body + do { return tokens[index]; } @@ -1891,7 +2189,28 @@ const pure @safe @nogc: bool currentIs(IdType tokenType) nothrow { - return index < tokens.length && tokens[index].type == tokenType; + return hasCurrent && tokens[index].type == tokenType; + } + + bool onNextLine() @nogc nothrow pure @safe + { + import dfmt.editorconfig : OptionalBoolean; + import std.algorithm.searching : count; + import std.string : representation; + + if (config.dfmt_keep_line_breaks == OptionalBoolean.f || index <= 0) + { + return false; + } + // To compare whether 2 tokens are on same line, we need the end line + // of the first token (tokens[index - 1]) and the start line of the + // second one (tokens[index]). If a token takes multiple lines (e.g. a + // multi-line string), we can sum the number of the newlines in the + // token and tokens[index - 1].line, the start line. + const previousTokenEndLineNo = tokens[index - 1].line + + tokens[index - 1].text.representation.count('\n'); + + return previousTokenEndLineNo < tokens[index].line; } /// Bugs: not unicode correct diff --git a/src/dfmt/globmatch_editorconfig.d b/src/dfmt/globmatch_editorconfig.d index 898460f..eff1b79 100644 --- a/src/dfmt/globmatch_editorconfig.d +++ b/src/dfmt/globmatch_editorconfig.d @@ -12,7 +12,7 @@ import std.path : filenameCharCmp, isDirSeparator; // * changes meaning to match all characters except '/' // ** added to take over the old meaning of * bool globMatchEditorConfig(CaseSensitive cs = CaseSensitive.osDefault, C, Range)( - Range path, const(C)[] pattern) @safe pure nothrow + Range path, const(C)[] pattern) @safe pure nothrow if (isForwardRange!Range && isSomeChar!(ElementEncodingType!Range) && isSomeChar!C && is(Unqual!C == Unqual!(ElementEncodingType!Range))) in @@ -23,7 +23,7 @@ in assert(balancedParens(pattern, '[', ']', 0)); assert(balancedParens(pattern, '{', '}', 0)); } -body +do { alias RC = Unqual!(ElementEncodingType!Range); diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index 8eeacea..7b5da72 100644 --- a/src/dfmt/indentation.d +++ b/src/dfmt/indentation.d @@ -5,8 +5,12 @@ module dfmt.indentation; +import dfmt.config; +import dfmt.editorconfig; import dparse.lexer; +import std.bitmanip : bitfields; + /** * Returns: true if the given token type is a wrap indent type */ @@ -29,6 +33,31 @@ bool isTempIndent(IdType type) pure nothrow @nogc @safe */ struct IndentStack { + /// Configuration + private const Config* config; + + this(const Config* config) + { + this.config = config; + } + + static struct Details + { + mixin(bitfields!( + // generally true for all operators except {, case, @, ], (, ) + bool, "wrap", 1, + // temporary indentation which get's reverted when a block starts + // generally true for all tokens except ), {, case, @ + bool, "temp", 1, + // emit minimal newlines + bool, "mini", 1, + // for associative arrays or arrays containing them, break after every item + bool, "breakEveryItem", 1, + // when an item inside an array would break mid-item, definitely break at the comma first + bool, "preferLongBreaking", 1, + uint, "", 27)); + } + /** * Get the indent size at the most recent occurrence of the given indent type */ @@ -55,7 +84,7 @@ struct IndentStack int tempIndentCount = 0; for (size_t i = index; i > 0; i--) { - if (!isWrapIndent(arr[i - 1]) && arr[i - 1] != tok!"]") + if (!details[i - 1].wrap && arr[i - 1] != tok!"]") break; tempIndentCount++; } @@ -66,8 +95,20 @@ struct IndentStack * Pushes the given indent type on to the stack. */ void push(IdType item) pure nothrow + { + Details detail; + detail.wrap = isWrapIndent(item); + detail.temp = isTempIndent(item); + push(item, detail); + } + + /** + * Pushes the given indent type on to the stack. + */ + void push(IdType item, Details detail) pure nothrow { arr[index] = item; + details[index] = detail; //FIXME this is actually a bad thing to do, //we should not just override when the stack is //at it's limit @@ -91,7 +132,7 @@ struct IndentStack */ void popWrapIndents() pure nothrow @safe @nogc { - while (index > 0 && isWrapIndent(arr[index - 1])) + while (index > 0 && details[index - 1].wrap) index--; } @@ -100,7 +141,7 @@ struct IndentStack */ void popTempIndents() pure nothrow @safe @nogc { - while (index > 0 && isTempIndent(arr[index - 1])) + while (index > 0 && details[index - 1].temp) index--; } @@ -125,7 +166,15 @@ struct IndentStack */ bool topIsTemp() { - return index > 0 && index <= arr.length && isTempIndent(arr[index - 1]); + return index > 0 && index <= arr.length && details[index - 1].temp; + } + + /** + * Returns: `true` if the top of the indent stack is a temporary indent with the specified token + */ + bool topIsTemp(IdType item) + { + return index > 0 && index <= arr.length && arr[index - 1] == item && details[index - 1].temp; } /** @@ -133,7 +182,15 @@ struct IndentStack */ bool topIsWrap() { - return index > 0 && index <= arr.length && isWrapIndent(arr[index - 1]); + return index > 0 && index <= arr.length && details[index - 1].wrap; + } + + /** + * Returns: `true` if the top of the indent stack is a temporary indent with the specified token + */ + bool topIsWrap(IdType item) + { + return index > 0 && index <= arr.length && arr[index - 1] == item && details[index - 1].wrap; } /** @@ -156,6 +213,11 @@ struct IndentStack return arr[index - 1]; } + Details topDetails() const pure nothrow @property @safe @nogc + { + return details[index - 1]; + } + int indentLevel() const pure nothrow @property @safe @nogc { return indentSize(); @@ -169,13 +231,16 @@ struct IndentStack /** * Dumps the current state of the indentation stack to `stderr`. Used for debugging. */ - void dump(string file = __FILE__, uint line = __LINE__) + void dump(size_t pos = size_t.max, string file = __FILE__, uint line = __LINE__) const { import dparse.lexer : str; import std.algorithm.iteration : map; import std.stdio : stderr; - stderr.writefln("\033[31m%s:%d %(%s %)\033[0m", file, line, arr[0 .. index].map!(a => str(a))); + if (pos == size_t.max) + stderr.writefln("\033[31m%s:%d %(%s %)\033[0m", file, line, arr[0 .. index].map!(a => str(a))); + else + stderr.writefln("\033[31m%s:%d at %d %(%s %)\033[0m", file, line, pos, arr[0 .. index].map!(a => str(a))); } private: @@ -183,6 +248,7 @@ private: size_t index; IdType[256] arr; + Details[arr.length] details; int indentSize(const size_t k = size_t.max) const pure nothrow @safe @nogc { @@ -196,17 +262,22 @@ private: { immutable int pc = (arr[i] == tok!"!" || arr[i] == tok!"(" || arr[i] == tok!")") ? parenCount + 1 : parenCount; - if ((isWrapIndent(arr[i]) || arr[i] == tok!"(") && parenCount > 1) + if ((details[i].wrap || arr[i] == tok!"(") && parenCount > 1) { parenCount = pc; continue; } + if (i + 1 < index) { - if (arr[i] == tok!"]") + if (config.dfmt_single_indent == OptionalBoolean.t && skipDoubleIndent(i, parenCount)) + { + parenCount = pc; continue; - immutable currentIsNonWrapTemp = !isWrapIndent(arr[i]) - && isTempIndent(arr[i]) && arr[i] != tok!")" && arr[i] != tok!"!"; + } + + immutable currentIsNonWrapTemp = !details[i].wrap + && details[i].temp && arr[i] != tok!")" && arr[i] != tok!"!"; if (arr[i] == tok!"static" && arr[i + 1].among!(tok!"if", tok!"else", tok!"foreach", tok!"foreach_reverse") && (i + 2 >= index || arr[i + 2] != tok!"{")) @@ -221,15 +292,23 @@ private: continue; } } - else if (parenCount == 0 && arr[i] == tok!"(") + else if (parenCount == 0 && arr[i] == tok!"(" && config.dfmt_single_indent == OptionalBoolean.f) size++; + if (arr[i] == tok!"!") size++; + parenCount = pc; size++; } return size; } + + bool skipDoubleIndent(size_t i, int parenCount) const pure nothrow @safe @nogc + { + return (details[i + 1].wrap && arr[i] == tok!")") + || (parenCount == 0 && arr[i + 1] == tok!"," && arr[i] == tok!"("); + } } unittest diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 1e39bb3..7a4d843 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -19,14 +19,14 @@ static immutable VERSION = () { version (built_with_dub) { - enum DFMT_VERSION = import("dubhash.txt").strip; + enum DFMT_VERSION = import("dubhash.txt").strip; } else { - /** - * Current build's Git commit hash - */ - enum DFMT_VERSION = import("githash.txt").strip; + /** + * Current build's Git commit hash + */ + enum DFMT_VERSION = import("githash.txt").strip; } return DFMT_VERSION ~ DEBUG_SUFFIX; @@ -89,6 +89,15 @@ else case "single_template_constraint_indent": optConfig.dfmt_single_template_constraint_indent = optVal; break; + case "space_before_aa_colon": + optConfig.dfmt_space_before_aa_colon = optVal; + break; + case "keep_line_breaks": + optConfig.dfmt_keep_line_breaks = optVal; + break; + case "single_indent": + optConfig.dfmt_single_indent = optVal; + break; default: assert(false, "Invalid command-line switch"); } @@ -116,8 +125,11 @@ else "split_operator_at_line_end", &handleBooleans, "compact_labeled_statements", &handleBooleans, "single_template_constraint_indent", &handleBooleans, + "space_before_aa_colon", &handleBooleans, "tab_width", &optConfig.tab_width, - "template_constraint_style", &optConfig.dfmt_template_constraint_style); + "template_constraint_style", &optConfig.dfmt_template_constraint_style, + "keep_line_breaks", &handleBooleans, + "single_indent", &handleBooleans); // dfmt on } catch (GetOptException e) @@ -169,7 +181,7 @@ else if (!exists(explicitConfigDir) || !isDir(explicitConfigDir)) { - stderr.writeln("--config_dir|c must specify existing directory path"); + stderr.writeln("--config|c must specify existing directory path"); return 1; } explicitConfig = getConfigFor!Config(explicitConfigDir); @@ -207,7 +219,9 @@ else else break; } - format("stdin", buffer, output.lockingTextWriter(), &config); + immutable bool formatSuccess = format("stdin", buffer, + output.lockingTextWriter(), &config); + return formatSuccess ? 0 : 1; } else { @@ -215,6 +229,7 @@ else if (args.length >= 2) inplace = true; + int retVal; while (args.length > 0) { const path = args.front; @@ -249,11 +264,13 @@ else f.rawRead(buffer); if (inplace) output = File(path, "wb"); - format(path, buffer, output.lockingTextWriter(), &config); + immutable bool formatSuccess = format(path, buffer, output.lockingTextWriter(), &config); + if (!formatSuccess) + retVal = 1; } } + return retVal; } - return 0; } } @@ -293,7 +310,7 @@ https://github.com/dlang-community/dfmt Options: --help, -h Print this help message --inplace, -i Edit files in place - --config_dir, -c Path to directory to load .editorconfig file from. + --config, -c Path to directory to load .editorconfig file from. --version Print the version number and then exit Formatting Options: @@ -304,6 +321,7 @@ Formatting Options: --indent_size --indent_style, -t `, optionsToString!(typeof(Config.indent_style)), ` + --keep_line_breaks --soft_max_line_length --max_line_length --outdent_attributes @@ -314,6 +332,8 @@ Formatting Options: --split_operator_at_line_end --compact_labeled_statements --template_constraint_style + --space_before_aa_colon + --single_indent `, optionsToString!(typeof(Config.dfmt_template_constraint_style))); } diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d index 952cc31..0271fde 100644 --- a/src/dfmt/tokens.d +++ b/src/dfmt/tokens.d @@ -15,7 +15,7 @@ in { assert(tokens[0].type == tok!"("); } -body +do { uint length = 0; size_t i = 1; @@ -134,7 +134,6 @@ int breakCost(IdType p, IdType c) pure nothrow @safe @nogc case tok!"||": case tok!"&&": case tok!",": - case tok!":": case tok!"?": return 0; case tok!"(": @@ -184,6 +183,10 @@ int breakCost(IdType p, IdType c) pure nothrow @safe @nogc case tok!"~": case tok!"+=": return 200; + case tok!":": + // colon could be after a label or an import, where it should normally wrap like before + // for everything else (associative arrays) try not breaking around colons + return p == tok!"identifier" ? 0 : 300; case tok!".": return p == tok!")" ? 0 : 300; default: @@ -227,7 +230,7 @@ private string generateFixedLengthCases() "package", "pragma", "private", "protected", "public", "pure", "real", "ref", "return", "scope", "shared", "short", "static", "struct", "super", "switch", "synchronized", "template", "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", - "union", "unittest", "ushort", "version", "void", "volatile", "wchar", + "union", "unittest", "ushort", "version", "void", "wchar", "while", "with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", diff --git a/src/dfmt/wrapping.d b/src/dfmt/wrapping.d index 41edf2f..79fb85f 100644 --- a/src/dfmt/wrapping.d +++ b/src/dfmt/wrapping.d @@ -172,9 +172,6 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens, void validMoves(OR)(auto ref OR output, const Token[] tokens, immutable short[] depths, uint current, const Config* config, int currentLineLength, int indentLevel) { - import std.algorithm : sort, canFind, min; - import std.array : insertInPlace; - foreach (i, token; tokens) { if (!isBreakToken(token.type) || (((1 << i) & current) != 0)) diff --git a/stdx-allocator b/stdx-allocator index b7778fd..ae237ca 160000 --- a/stdx-allocator +++ b/stdx-allocator @@ -1 +1 @@ -Subproject commit b7778fd6bf5f9aaaa87dd27f989cefbf9b3b365f +Subproject commit ae237cabd1843774cc78aad0729c914a3dd579db diff --git a/tests/2d_arrays.d b/tests/2d_arrays.d new file mode 100644 index 0000000..14a1590 --- /dev/null +++ b/tests/2d_arrays.d @@ -0,0 +1,17 @@ +unittest +{ + targets = [[RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), vec2(16 * scale, + 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0))], + [RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), vec2(16 * scale, + 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), RectangleShape.create(tex, + vec2(-8 * scale, -8 * scale), vec2(16 * scale, 16 * scale), + vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0))]]; + + int[][] foo = [[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32], [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32]]; + + float[3][3] mat = [[234.3456,42435.8653,23.5],[3.245,235.3,234.664],[14324.6453,23434.645,9678.345]]; +} + +string[][] globalArray = [["123456789012345678901234567890", "123456789012345678901234567890"], ["123456789012345678901234567890", "123456789012345678901234567890"]]; diff --git a/tests/allman/2d_arrays.d.ref b/tests/allman/2d_arrays.d.ref new file mode 100644 index 0000000..628be8b --- /dev/null +++ b/tests/allman/2d_arrays.d.ref @@ -0,0 +1,38 @@ +unittest +{ + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/allman/array_access.d.ref b/tests/allman/array_access.d.ref new file mode 100644 index 0000000..b09ebfe --- /dev/null +++ b/tests/allman/array_access.d.ref @@ -0,0 +1,7 @@ +unittest +{ + foo([ + target.value.region[1], target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1] + ]); +} diff --git a/tests/allman/assoc_key_indent.d.ref b/tests/allman/assoc_key_indent.d.ref new file mode 100644 index 0000000..a357a35 --- /dev/null +++ b/tests/allman/assoc_key_indent.d.ref @@ -0,0 +1,8 @@ +void main() +{ + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/allman/associative_array.d.ref b/tests/allman/associative_array.d.ref new file mode 100644 index 0000000..b0e671b --- /dev/null +++ b/tests/allman/associative_array.d.ref @@ -0,0 +1,26 @@ +unittest +{ + Bson base = Bson([ + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]; +} diff --git a/tests/allman/associative_array_complex.d.ref b/tests/allman/associative_array_complex.d.ref new file mode 100644 index 0000000..f637ca3 --- /dev/null +++ b/tests/allman/associative_array_complex.d.ref @@ -0,0 +1,25 @@ +auto find() +{ + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/allman/dip1009.d.ref b/tests/allman/dip1009.d.ref index 1b65b6b..8383266 100644 --- a/tests/allman/dip1009.d.ref +++ b/tests/allman/dip1009.d.ref @@ -13,8 +13,8 @@ do } int bar(int arg) -in(arg > 0) -out(; true) +in (arg > 0) +out (; true) out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) { return 0; diff --git a/tests/allman/issue0017.d.ref b/tests/allman/issue0017.d.ref index 8a32cec..541c22a 100644 --- a/tests/allman/issue0017.d.ref +++ b/tests/allman/issue0017.d.ref @@ -1,3 +1,4 @@ -immutable NameId[] namesA = [{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS -{"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS +immutable NameId[] namesA = [ + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/allman/issue0023.d.ref b/tests/allman/issue0023.d.ref index 67aa5f5..64e52e3 100644 --- a/tests/allman/issue0023.d.ref +++ b/tests/allman/issue0023.d.ref @@ -9,25 +9,28 @@ string generateFixedLengthCases() string[] fixedLengthTokens = [ "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", - "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", "char", "class", - "const", "continue", "creal", "dchar", "debug", "default", "delegate", "delete", "deprecated", - "do", "double", "else", "enum", "export", "extern", "false", "final", "finally", "float", - "for", "foreach", "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", "immutable", - "import", "in", "inout", "int", "interface", "invariant", "ireal", "is", - "lazy", "long", "macro", "mixin", "module", "new", "nothrow", "null", "out", "override", - "package", "pragma", "private", "protected", "public", "pure", "real", "ref", "return", "scope", - "shared", "short", "static", "struct", "super", "switch", "synchronized", "template", "this", - "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", - "union", "unittest", "ushort", "version", "void", "volatile", "wchar", - "while", "with", "__DATE__", "__EOF__", "__FILE__", - "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters", - "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", - "__traits", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", - "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", - "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", - "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", - "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~=" + "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", + "char", "class", "const", "continue", "creal", "dchar", "debug", "default", + "delegate", "delete", "deprecated", "do", "double", "else", "enum", + "export", "extern", "false", "final", "finally", "float", "for", "foreach", + "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", + "immutable", "import", "in", "inout", "int", "interface", "invariant", + "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", + "nothrow", "null", "out", "override", "package", "pragma", "private", + "protected", "public", "pure", "real", "ref", "return", "scope", "shared", + "short", "static", "struct", "super", "switch", "synchronized", "template", + "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", + "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void", + "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", + "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", + "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", + "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VERSION__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" ]; } diff --git a/tests/allman/issue0112_variation.d.ref b/tests/allman/issue0112_variation.d.ref new file mode 100644 index 0000000..084e5eb --- /dev/null +++ b/tests/allman/issue0112_variation.d.ref @@ -0,0 +1,15 @@ +unittest +{ + testScene = new Scene(longArgument, longArgument, longArgument, + longArgument, longArgument, longArgument, delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) + { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/allman/issue0119.d.ref b/tests/allman/issue0119.d.ref index cf1d9c3..57fcdd0 100644 --- a/tests/allman/issue0119.d.ref +++ b/tests/allman/issue0119.d.ref @@ -1,5 +1,5 @@ -auto fun = function() { }; -auto fun = () { }; +auto fun = function() {}; +auto fun = () {}; auto fun = {}; auto fun = { int i; }; diff --git a/tests/allman/issue0134.d.ref b/tests/allman/issue0134.d.ref new file mode 100644 index 0000000..fbc72c0 --- /dev/null +++ b/tests/allman/issue0134.d.ref @@ -0,0 +1,15 @@ +void foo() +{ + string command; + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + unittest + { + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/allman/issue0195.d.ref b/tests/allman/issue0195.d.ref new file mode 100644 index 0000000..b638abf --- /dev/null +++ b/tests/allman/issue0195.d.ref @@ -0,0 +1,16 @@ +void main() +{ + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; l) + { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/allman/issue0256.d.ref b/tests/allman/issue0256.d.ref new file mode 100644 index 0000000..5776aec --- /dev/null +++ b/tests/allman/issue0256.d.ref @@ -0,0 +1,11 @@ +void main() +{ + S s1 = {a: 3}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + T t = { + someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar + someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, + somethingMore: null, someFlagInThisStruct: -1 + }; +} diff --git a/tests/allman/issue0287.d.ref b/tests/allman/issue0287.d.ref index 461addf..9966542 100644 --- a/tests/allman/issue0287.d.ref +++ b/tests/allman/issue0287.d.ref @@ -1,3 +1,3 @@ alias foo = typeof({ import std.math; }); alias bar = typeof({ write("aaa"); }); -alias baz = typeof({ }); +alias baz = typeof({}); diff --git a/tests/allman/issue0361.d.ref b/tests/allman/issue0361.d.ref new file mode 100644 index 0000000..30c7f2e --- /dev/null +++ b/tests/allman/issue0361.d.ref @@ -0,0 +1,15 @@ +void foo() /**/ +in +{ +} +body +{ +} + +void bar() /**/ +out +{ +} +body +{ +} diff --git a/tests/allman/issue0426.d.ref b/tests/allman/issue0426.d.ref new file mode 100644 index 0000000..72d3d26 --- /dev/null +++ b/tests/allman/issue0426.d.ref @@ -0,0 +1,6 @@ +import std.stdio; + +@safe extern (C) void main() +{ + writeln("Hello World!"); +} diff --git a/tests/allman/issue0430.d.ref b/tests/allman/issue0430.d.ref new file mode 100644 index 0000000..ea6b044 --- /dev/null +++ b/tests/allman/issue0430.d.ref @@ -0,0 +1,6 @@ +void f(bool body) +{ + if (body) + { + } +} diff --git a/tests/allman/issue0433.d.ref b/tests/allman/issue0433.d.ref new file mode 100644 index 0000000..bde6071 --- /dev/null +++ b/tests/allman/issue0433.d.ref @@ -0,0 +1,7 @@ +int abs(int x) +{ + if (x < 0) // x negative, must negate + return -x; + else // x already non-negative, just return it + return x; +} diff --git a/tests/allman/issue0436.d.ref b/tests/allman/issue0436.d.ref new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/allman/issue0436.d.ref @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/allman/issue0448.d.ref b/tests/allman/issue0448.d.ref new file mode 100644 index 0000000..fd820ce --- /dev/null +++ b/tests/allman/issue0448.d.ref @@ -0,0 +1,4 @@ +struct S +{ + invariant (true); +} diff --git a/tests/allman/issue0451.d.ref b/tests/allman/issue0451.d.ref new file mode 100644 index 0000000..c5b2f27 --- /dev/null +++ b/tests/allman/issue0451.d.ref @@ -0,0 +1,40 @@ +class C +{ + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do + { + } + + abstract void f6() /* */ + do + { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ + { + return true; + } +} diff --git a/tests/allman/issue0452.d.ref b/tests/allman/issue0452.d.ref new file mode 100644 index 0000000..e4aed14 --- /dev/null +++ b/tests/allman/issue0452.d.ref @@ -0,0 +1,2 @@ +@nogc // +void foo(); diff --git a/tests/allman/issue0454.d.ref b/tests/allman/issue0454.d.ref new file mode 100644 index 0000000..27b0ef1 --- /dev/null +++ b/tests/allman/issue0454.d.ref @@ -0,0 +1,10 @@ +void main() +{ + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, + argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/allman/issue0465.d.ref b/tests/allman/issue0465.d.ref new file mode 100644 index 0000000..b28f284 --- /dev/null +++ b/tests/allman/issue0465.d.ref @@ -0,0 +1,8 @@ +bool asdf(const string owner, const string mail) @safe +{ + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/allman/issue0476.d.ref b/tests/allman/issue0476.d.ref new file mode 100644 index 0000000..c95e2de --- /dev/null +++ b/tests/allman/issue0476.d.ref @@ -0,0 +1,7 @@ +string BuildForwardCall() +{ + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/allman/issue0483.d.ref b/tests/allman/issue0483.d.ref new file mode 100644 index 0000000..1d77e68 --- /dev/null +++ b/tests/allman/issue0483.d.ref @@ -0,0 +1,15 @@ +module tests.issue0483; + +void main() +{ + switch (0) + { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/allman/issue0485.d.ref b/tests/allman/issue0485.d.ref new file mode 100644 index 0000000..037932e --- /dev/null +++ b/tests/allman/issue0485.d.ref @@ -0,0 +1,5 @@ +void main() +{ + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/allman/issue0486.d.ref b/tests/allman/issue0486.d.ref new file mode 100644 index 0000000..de7a540 --- /dev/null +++ b/tests/allman/issue0486.d.ref @@ -0,0 +1,5 @@ +void main() +{ + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/allman/issue0497.d.ref b/tests/allman/issue0497.d.ref new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/allman/issue0497.d.ref @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/allman/issue0501.d.ref b/tests/allman/issue0501.d.ref new file mode 100644 index 0000000..8f1cf11 --- /dev/null +++ b/tests/allman/issue0501.d.ref @@ -0,0 +1,4 @@ +void main() +{ + auto aa = ["aaa": 1, "bbb": 2]; +} diff --git a/tests/allman/issue0504.d.ref b/tests/allman/issue0504.d.ref new file mode 100644 index 0000000..7fb4598 --- /dev/null +++ b/tests/allman/issue0504.d.ref @@ -0,0 +1,40 @@ +deprecated("foo") +void test() +{ +} + +package(foo) +void bar() +{ +} + +@uda() +void baz() +{ +} + +deprecated +deprecated_() +{ +} + +@uda +void uda_() +{ +} + +@property +void property() +{ +} + +deprecated("Reason") @uda +void propertyuda() +{ +} + +deprecated("Reason") +@uda +void udaproperty() +{ +} diff --git a/tests/allman/issue0508.d.ref b/tests/allman/issue0508.d.ref new file mode 100644 index 0000000..af4c328 --- /dev/null +++ b/tests/allman/issue0508.d.ref @@ -0,0 +1,7 @@ +struct S +{ + @safe invariant + { + assert(true); + } +} diff --git a/tests/allman/issue0509.d.ref b/tests/allman/issue0509.d.ref new file mode 100644 index 0000000..52b1c7c --- /dev/null +++ b/tests/allman/issue0509.d.ref @@ -0,0 +1,34 @@ +void main() +{ + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf // blah + .flub; +} + +void main() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/allman/issue0515.d.ref b/tests/allman/issue0515.d.ref new file mode 100644 index 0000000..55d01d9 --- /dev/null +++ b/tests/allman/issue0515.d.ref @@ -0,0 +1,7 @@ +struct S +{ + ref S foo() return + { + return this; + } +} diff --git a/tests/allman/issue0521.d.ref b/tests/allman/issue0521.d.ref new file mode 100644 index 0000000..67a0942 --- /dev/null +++ b/tests/allman/issue0521.d.ref @@ -0,0 +1,17 @@ +public int f() return +in (true) +{ + return 0; +} + +public int g() return +out (; true) +{ + return 0; +} + +public int h() return +body +{ + return 0; +} diff --git a/tests/allman/issue0528.d.ref b/tests/allman/issue0528.d.ref new file mode 100644 index 0000000..3592591 --- /dev/null +++ b/tests/allman/issue0528.d.ref @@ -0,0 +1,4 @@ +void f() return +do +{ +} diff --git a/tests/allman/keep_break_in_array_arg.d.ref b/tests/allman/keep_break_in_array_arg.d.ref new file mode 100644 index 0000000..88bc23f --- /dev/null +++ b/tests/allman/keep_break_in_array_arg.d.ref @@ -0,0 +1,6 @@ +unittest +{ + f([ + x + ]); +} diff --git a/tests/allman/keep_break_in_array_chain.d.ref b/tests/allman/keep_break_in_array_chain.d.ref new file mode 100644 index 0000000..b6c691a --- /dev/null +++ b/tests/allman/keep_break_in_array_chain.d.ref @@ -0,0 +1,7 @@ +unittest +{ + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/allman/keep_line_breaks.d.ref b/tests/allman/keep_line_breaks.d.ref new file mode 100644 index 0000000..cd51650 --- /dev/null +++ b/tests/allman/keep_line_breaks.d.ref @@ -0,0 +1,38 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) +{ + if (true && true + && true && true + && true && true) + { + } + else if (true && true && + true && true && + true && true) + { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + + ` + + + `.format!"%s"; + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/allman/keep_single_indent.d.ref b/tests/allman/keep_single_indent.d.ref new file mode 100644 index 0000000..f164801 --- /dev/null +++ b/tests/allman/keep_single_indent.d.ref @@ -0,0 +1,49 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +void f() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/allman/single_indent.d.ref b/tests/allman/single_indent.d.ref new file mode 100644 index 0000000..b4b497a --- /dev/null +++ b/tests/allman/single_indent.d.ref @@ -0,0 +1,41 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/array_access.d b/tests/array_access.d new file mode 100644 index 0000000..9a96e57 --- /dev/null +++ b/tests/array_access.d @@ -0,0 +1,4 @@ +unittest +{ + foo([target.value.region[1], target.value.region[1], target.value.region[1], target.value.region[1], target.value.region[1]]); +} \ No newline at end of file diff --git a/tests/assoc_key_indent.args b/tests/assoc_key_indent.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/assoc_key_indent.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/assoc_key_indent.d b/tests/assoc_key_indent.d new file mode 100644 index 0000000..a357a35 --- /dev/null +++ b/tests/assoc_key_indent.d @@ -0,0 +1,8 @@ +void main() +{ + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/associative_array.d b/tests/associative_array.d new file mode 100644 index 0000000..d38762c --- /dev/null +++ b/tests/associative_array.d @@ -0,0 +1,26 @@ +unittest +{ + Bson base = Bson([ + "maps": Bson([ + Bson([ + "id": Bson(4), + "comment": Bson("hello") + ]), + Bson([ + "id": Bson(49), + "comment": Bson(null) + ]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0]; +} diff --git a/tests/associative_array_complex.d b/tests/associative_array_complex.d new file mode 100644 index 0000000..c61c83b --- /dev/null +++ b/tests/associative_array_complex.d @@ -0,0 +1,11 @@ +auto find() +{ + return Map.findRange(["$and": [ + ["deleted": Bson(false)], + ["$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson(["info.approved": ["$eq": Bson(1)], "fetchDate": ["$lte": Bson(BsonDate(currentTime - 60.days))]]), + serializeToBson(["info.approved": ["$ne": Bson(1)], "fetchDate": ["$lte": Bson(BsonDate(currentTime - 14.days))]]) + ])] + ]]); +} diff --git a/tests/expected_failures/issue0469.d b/tests/expected_failures/issue0469.d new file mode 100644 index 0000000..971c8f7 --- /dev/null +++ b/tests/expected_failures/issue0469.d @@ -0,0 +1 @@ +import std.stdio; void main() { writeln("\eee8Hello"); int a = 5; } diff --git a/tests/gen_expected.sh b/tests/gen_expected.sh index a5520f7..b49ae4a 100755 --- a/tests/gen_expected.sh +++ b/tests/gen_expected.sh @@ -1,10 +1,12 @@ +#!/usr/bin/env bash + argsFile=$1.args if [ -e ${argsFile} ]; then args=$(cat ${argsFile}) fi echo "Args:" ${args} -dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref -dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref +../bin/dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref +../bin/dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref echo "------------------" echo "allman:" diff --git a/tests/issue0112_variation.d b/tests/issue0112_variation.d new file mode 100644 index 0000000..73e3d89 --- /dev/null +++ b/tests/issue0112_variation.d @@ -0,0 +1,18 @@ +unittest +{ + testScene = new Scene + ( + longArgument, longArgument, longArgument, longArgument, longArgument, longArgument, + delegate(Scene scene) + { + import std.stdio; + + if (!scene.alreadyEntered) + { + fwriteln("This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal)sceneManager.previousScene; + scene.destroyCurrentScript(); + } + } + ); +} diff --git a/tests/issue0128.args b/tests/issue0128.args new file mode 100644 index 0000000..03f0da5 --- /dev/null +++ b/tests/issue0128.args @@ -0,0 +1 @@ +--space_before_aa_colon=true diff --git a/tests/issue0134.d b/tests/issue0134.d new file mode 100644 index 0000000..8b57f0e --- /dev/null +++ b/tests/issue0134.d @@ -0,0 +1,11 @@ +void foo() { + string command; + version (Posix) command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) command ~= " 2> /dev/null 1> /dev/null"; + + unittest + { + version (Posix) command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/issue0195.d b/tests/issue0195.d new file mode 100644 index 0000000..f92a7ef --- /dev/null +++ b/tests/issue0195.d @@ -0,0 +1,17 @@ +void main() +{ + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; + l) + { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/issue0256.d b/tests/issue0256.d new file mode 100644 index 0000000..18f4c98 --- /dev/null +++ b/tests/issue0256.d @@ -0,0 +1,15 @@ +void main() { + S s1 = { a: 3 }; + S s2 = { a: 3, b:"test string" }; + S s3 = { a: 3, b:"test string", c: {x: 3.14, y: 3 + 4} }; + T t = { + someStructMember1: 2, + someStructMember2: 42, + someStructMember3: null, // foobar + someOtherMember1: objA, + someOtherMember2: objB, + someOtherMember3: 0, + somethingMore: null, + someFlagInThisStruct: -1 + }; +} diff --git a/tests/issue0361.d b/tests/issue0361.d new file mode 100644 index 0000000..30c7f2e --- /dev/null +++ b/tests/issue0361.d @@ -0,0 +1,15 @@ +void foo() /**/ +in +{ +} +body +{ +} + +void bar() /**/ +out +{ +} +body +{ +} diff --git a/tests/issue0426.d b/tests/issue0426.d new file mode 100644 index 0000000..12855aa --- /dev/null +++ b/tests/issue0426.d @@ -0,0 +1,5 @@ +import std.stdio; + +@safe extern(C) void main() { + writeln("Hello World!"); +} \ No newline at end of file diff --git a/tests/issue0430.d b/tests/issue0430.d new file mode 100644 index 0000000..f8acf72 --- /dev/null +++ b/tests/issue0430.d @@ -0,0 +1,4 @@ +void f(bool body) { + if (body) { + } +} \ No newline at end of file diff --git a/tests/issue0433.d b/tests/issue0433.d new file mode 100644 index 0000000..0320fb4 --- /dev/null +++ b/tests/issue0433.d @@ -0,0 +1,8 @@ +int abs(int x) { + if (x < 0) + // x negative, must negate + return -x; + else + // x already non-negative, just return it + return x; +} \ No newline at end of file diff --git a/tests/issue0436.d b/tests/issue0436.d new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/issue0436.d @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/issue0448.d b/tests/issue0448.d new file mode 100644 index 0000000..a643618 --- /dev/null +++ b/tests/issue0448.d @@ -0,0 +1,4 @@ +struct S +{ + invariant(true); +} diff --git a/tests/issue0451.d b/tests/issue0451.d new file mode 100644 index 0000000..c5b2f27 --- /dev/null +++ b/tests/issue0451.d @@ -0,0 +1,40 @@ +class C +{ + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do + { + } + + abstract void f6() /* */ + do + { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ + { + return true; + } +} diff --git a/tests/issue0452.d b/tests/issue0452.d new file mode 100644 index 0000000..0ad0f5d --- /dev/null +++ b/tests/issue0452.d @@ -0,0 +1,3 @@ +@nogc +// +void foo(); diff --git a/tests/issue0454.d b/tests/issue0454.d new file mode 100644 index 0000000..9561fb3 --- /dev/null +++ b/tests/issue0454.d @@ -0,0 +1,9 @@ +void main() +{ + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/issue0465.d b/tests/issue0465.d new file mode 100644 index 0000000..e3026ea --- /dev/null +++ b/tests/issue0465.d @@ -0,0 +1,9 @@ +bool asdf(const string owner, const string mail) @safe +{ + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: + mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/issue0476.d b/tests/issue0476.d new file mode 100644 index 0000000..c95e2de --- /dev/null +++ b/tests/issue0476.d @@ -0,0 +1,7 @@ +string BuildForwardCall() +{ + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/issue0483.args b/tests/issue0483.args new file mode 100644 index 0000000..91e2439 --- /dev/null +++ b/tests/issue0483.args @@ -0,0 +1 @@ +--align_switch_statements=false diff --git a/tests/issue0483.d b/tests/issue0483.d new file mode 100644 index 0000000..1d77e68 --- /dev/null +++ b/tests/issue0483.d @@ -0,0 +1,15 @@ +module tests.issue0483; + +void main() +{ + switch (0) + { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/issue0485.args b/tests/issue0485.args new file mode 100644 index 0000000..1b0d2ce --- /dev/null +++ b/tests/issue0485.args @@ -0,0 +1 @@ +--space_before_aa_colon true diff --git a/tests/issue0485.d b/tests/issue0485.d new file mode 100644 index 0000000..037932e --- /dev/null +++ b/tests/issue0485.d @@ -0,0 +1,5 @@ +void main() +{ + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/issue0486.args b/tests/issue0486.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/issue0486.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/issue0486.d b/tests/issue0486.d new file mode 100644 index 0000000..de7a540 --- /dev/null +++ b/tests/issue0486.d @@ -0,0 +1,5 @@ +void main() +{ + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/issue0497.d b/tests/issue0497.d new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/issue0497.d @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/issue0501.d b/tests/issue0501.d new file mode 100644 index 0000000..8ab0e10 --- /dev/null +++ b/tests/issue0501.d @@ -0,0 +1,4 @@ +void main() +{ + auto aa = ["aaa": 1, "bbb":2]; +} diff --git a/tests/issue0504.args b/tests/issue0504.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/issue0504.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/issue0504.d b/tests/issue0504.d new file mode 100644 index 0000000..7fb4598 --- /dev/null +++ b/tests/issue0504.d @@ -0,0 +1,40 @@ +deprecated("foo") +void test() +{ +} + +package(foo) +void bar() +{ +} + +@uda() +void baz() +{ +} + +deprecated +deprecated_() +{ +} + +@uda +void uda_() +{ +} + +@property +void property() +{ +} + +deprecated("Reason") @uda +void propertyuda() +{ +} + +deprecated("Reason") +@uda +void udaproperty() +{ +} diff --git a/tests/issue0508.d b/tests/issue0508.d new file mode 100644 index 0000000..d6f1f3d --- /dev/null +++ b/tests/issue0508.d @@ -0,0 +1 @@ +struct S {@safe invariant { assert(true); }} diff --git a/tests/issue0509.args b/tests/issue0509.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/issue0509.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/issue0509.d b/tests/issue0509.d new file mode 100644 index 0000000..52b1c7c --- /dev/null +++ b/tests/issue0509.d @@ -0,0 +1,34 @@ +void main() +{ + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf // blah + .flub; +} + +void main() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/issue0515.d b/tests/issue0515.d new file mode 100644 index 0000000..55d01d9 --- /dev/null +++ b/tests/issue0515.d @@ -0,0 +1,7 @@ +struct S +{ + ref S foo() return + { + return this; + } +} diff --git a/tests/issue0521.d b/tests/issue0521.d new file mode 100644 index 0000000..67a0942 --- /dev/null +++ b/tests/issue0521.d @@ -0,0 +1,17 @@ +public int f() return +in (true) +{ + return 0; +} + +public int g() return +out (; true) +{ + return 0; +} + +public int h() return +body +{ + return 0; +} diff --git a/tests/issue0528.d b/tests/issue0528.d new file mode 100644 index 0000000..3592591 --- /dev/null +++ b/tests/issue0528.d @@ -0,0 +1,4 @@ +void f() return +do +{ +} diff --git a/tests/keep_break_in_array_arg.args b/tests/keep_break_in_array_arg.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/keep_break_in_array_arg.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/keep_break_in_array_arg.d b/tests/keep_break_in_array_arg.d new file mode 100644 index 0000000..88bc23f --- /dev/null +++ b/tests/keep_break_in_array_arg.d @@ -0,0 +1,6 @@ +unittest +{ + f([ + x + ]); +} diff --git a/tests/keep_break_in_array_chain.args b/tests/keep_break_in_array_chain.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/keep_break_in_array_chain.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/keep_break_in_array_chain.d b/tests/keep_break_in_array_chain.d new file mode 100644 index 0000000..03771ef --- /dev/null +++ b/tests/keep_break_in_array_chain.d @@ -0,0 +1,7 @@ +unittest +{ + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/keep_line_breaks.args b/tests/keep_line_breaks.args new file mode 100644 index 0000000..3e94d38 --- /dev/null +++ b/tests/keep_line_breaks.args @@ -0,0 +1 @@ +--keep_line_breaks true diff --git a/tests/keep_line_breaks.d b/tests/keep_line_breaks.d new file mode 100644 index 0000000..cd51650 --- /dev/null +++ b/tests/keep_line_breaks.d @@ -0,0 +1,38 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) +{ + if (true && true + && true && true + && true && true) + { + } + else if (true && true && + true && true && + true && true) + { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + + ` + + + `.format!"%s"; + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/keep_single_indent.args b/tests/keep_single_indent.args new file mode 100644 index 0000000..74b1ea5 --- /dev/null +++ b/tests/keep_single_indent.args @@ -0,0 +1,2 @@ +--single_indent true +--keep_line_breaks true diff --git a/tests/keep_single_indent.d b/tests/keep_single_indent.d new file mode 100644 index 0000000..c1c2d16 --- /dev/null +++ b/tests/keep_single_indent.d @@ -0,0 +1,49 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +void f() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/knr/.d.ref b/tests/knr/.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/knr/2d_arrays.d.ref b/tests/knr/2d_arrays.d.ref new file mode 100644 index 0000000..5b685ec --- /dev/null +++ b/tests/knr/2d_arrays.d.ref @@ -0,0 +1,37 @@ +unittest { + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/knr/DeclSpacing.d.ref b/tests/knr/DeclSpacing.d.ref new file mode 100644 index 0000000..ce51064 --- /dev/null +++ b/tests/knr/DeclSpacing.d.ref @@ -0,0 +1,15 @@ +import std.stdio; + +class Foo { +} + +import std.conv; + +void main() +{ + return; +} + +const baz = 11; +class Foo2 : Foo { +} diff --git a/tests/knr/array_access.d.ref b/tests/knr/array_access.d.ref new file mode 100644 index 0000000..cf66c3d --- /dev/null +++ b/tests/knr/array_access.d.ref @@ -0,0 +1,6 @@ +unittest { + foo([ + target.value.region[1], target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1] + ]); +} diff --git a/tests/knr/assoc_key_indent.d.ref b/tests/knr/assoc_key_indent.d.ref new file mode 100644 index 0000000..a357a35 --- /dev/null +++ b/tests/knr/assoc_key_indent.d.ref @@ -0,0 +1,8 @@ +void main() +{ + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/knr/associative_array.d.ref b/tests/knr/associative_array.d.ref new file mode 100644 index 0000000..48442a3 --- /dev/null +++ b/tests/knr/associative_array.d.ref @@ -0,0 +1,25 @@ +unittest { + Bson base = Bson([ + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]; +} diff --git a/tests/knr/associative_array_complex.d.ref b/tests/knr/associative_array_complex.d.ref new file mode 100644 index 0000000..f637ca3 --- /dev/null +++ b/tests/knr/associative_array_complex.d.ref @@ -0,0 +1,25 @@ +auto find() +{ + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/knr/attribute_constraint.d.ref b/tests/knr/attribute_constraint.d.ref new file mode 100644 index 0000000..db4af0d --- /dev/null +++ b/tests/knr/attribute_constraint.d.ref @@ -0,0 +1,13 @@ +struct SomeStructName { + static struct InnerStruct { + version (linux) { + static if (condition) { + void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property + if (someThingsAreTrue!AAAAAAAA && long_condition + && is(elaborate == expression)) + { + } + } + } + } +} diff --git a/tests/knr/breakOnDots.d.ref b/tests/knr/breakOnDots.d.ref new file mode 100644 index 0000000..bdfb29b --- /dev/null +++ b/tests/knr/breakOnDots.d.ref @@ -0,0 +1,13 @@ +unittest { + { + { + foreach (abcde, def; abcdef.map!(battlecruiser => battlecruiser[123 .. 1231231]) + .filter!(bravo => charlie[10] > 90000) + .sum()) { + + } + abcdeabcdeabcde(12341234).abcdeabcdeabcde(12341234).abcdeabcdeabcde(12341234) + .abcdeabcdeabcde(12341234).abcdeabcdeabcde(12341234); + } + } +} diff --git a/tests/knr/catchExceptionNested.d.ref b/tests/knr/catchExceptionNested.d.ref new file mode 100644 index 0000000..57217c1 --- /dev/null +++ b/tests/knr/catchExceptionNested.d.ref @@ -0,0 +1,41 @@ +class U0 : Exception { + this() @safe pure nothrow + { + super("U0 error message"); + } +} + +class U1 : Exception { + this() @safe pure nothrow + { + super("U1 error message"); + } +} + +void foo() +{ + import std.stdio; + + foreach (immutable i; 0 .. 2) { + try { + i.bar; + } catch (U0) { + "Function foo caught exception U0".writeln; + } + } +} + +void bar(in int i) @safe pure +{ + i.baz; +} + +void baz(in int i) @safe pure +{ + throw i ? new U1 : new U0; +} + +void main() +{ + foo; +} diff --git a/tests/knr/comments.d.ref b/tests/knr/comments.d.ref new file mode 100644 index 0000000..7139949 --- /dev/null +++ b/tests/knr/comments.d.ref @@ -0,0 +1,7 @@ +int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/ +{ + // comment on its own line + foo() // comment on same line + .bar(); // also on same line + /* again */ // same line +} diff --git a/tests/knr/constraint_singe_tab.d.ref b/tests/knr/constraint_singe_tab.d.ref new file mode 100644 index 0000000..176e0f4 --- /dev/null +++ b/tests/knr/constraint_singe_tab.d.ref @@ -0,0 +1,9 @@ +void foo()() + if (dogs && pigs && birds && ants && foxes && flies && cats && bugs && bees + && cows && sheeps && monkeys && whales) +{ +} + +void foo()() if (dogs && pigs && birds) +{ +} diff --git a/tests/knr/constraint_singe_tab2.d.ref b/tests/knr/constraint_singe_tab2.d.ref new file mode 100644 index 0000000..59c0cb1 --- /dev/null +++ b/tests/knr/constraint_singe_tab2.d.ref @@ -0,0 +1,10 @@ +void foo()() + if (dogs && pigs && birds && ants && foxes && flies && cats && bugs && bees + && cows && sheeps && monkeys && whales) +{ +} + +void foo()() + if (dogs && pigs && birds) +{ +} diff --git a/tests/knr/contracts.d.ref b/tests/knr/contracts.d.ref new file mode 100644 index 0000000..c90e330 --- /dev/null +++ b/tests/knr/contracts.d.ref @@ -0,0 +1,17 @@ +void main(string[] args) +{ + struct SomeStruct { + private: + int a; + int b; + void doStuff(int q) + in { + assert(q); + } + out (result) { + } + body { + writeln(q); + } + } +} diff --git a/tests/knr/debug-inside-if.d.ref b/tests/knr/debug-inside-if.d.ref new file mode 100644 index 0000000..13252df --- /dev/null +++ b/tests/knr/debug-inside-if.d.ref @@ -0,0 +1,7 @@ +void main() +{ + if (true) + debug { + foo(); + } +} diff --git a/tests/knr/debug_with_param.d.ref b/tests/knr/debug_with_param.d.ref new file mode 100644 index 0000000..b2c9baa --- /dev/null +++ b/tests/knr/debug_with_param.d.ref @@ -0,0 +1,7 @@ +void main() +{ + debug (0) + foo(); + else + bar(); +} diff --git a/tests/knr/dip1009.d.ref b/tests/knr/dip1009.d.ref new file mode 100644 index 0000000..ba2417d --- /dev/null +++ b/tests/knr/dip1009.d.ref @@ -0,0 +1,18 @@ +int foo(int arg) +in { + assert(arg > 0); +} +out (result) { + assert(result == 0); +} +do { + return 0; +} + +int bar(int arg) +in (arg > 0) +out (; true) +out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) +{ + return 0; +} diff --git a/tests/knr/do_body.d.ref b/tests/knr/do_body.d.ref new file mode 100644 index 0000000..89138ce --- /dev/null +++ b/tests/knr/do_body.d.ref @@ -0,0 +1,15 @@ +import character.body; + +void body() @nogc +in { +} +body { + body = null; +} + +void body() +in { +} +do { + body = null; +} diff --git a/tests/knr/empty.d.ref b/tests/knr/empty.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/knr/enum_attribs.d.ref b/tests/knr/enum_attribs.d.ref new file mode 100644 index 0000000..8ff4288 --- /dev/null +++ b/tests/knr/enum_attribs.d.ref @@ -0,0 +1,5 @@ +enum Foo { + + deprecated member0, + @UDA(0) member1 +} diff --git a/tests/knr/frontpage.d.ref b/tests/knr/frontpage.d.ref new file mode 100644 index 0000000..f7d9a45 --- /dev/null +++ b/tests/knr/frontpage.d.ref @@ -0,0 +1,13 @@ +// Computes average line length for standard input. +import std.stdio; + +void main() +{ + ulong lines = 0; + double sumLength = 0; + foreach (line; stdin.byLine()) { + ++lines; + sumLength += line.length; + } + writeln("Average line length: ", lines ? sumLength / lines : 0); +} diff --git a/tests/knr/func_param_attrib.d.ref b/tests/knr/func_param_attrib.d.ref new file mode 100644 index 0000000..8717517 --- /dev/null +++ b/tests/knr/func_param_attrib.d.ref @@ -0,0 +1 @@ +void foo(@UDA(0) @UDA(1) Bar bar); diff --git a/tests/knr/guessnumber.d.ref b/tests/knr/guessnumber.d.ref new file mode 100644 index 0000000..8ee4a28 --- /dev/null +++ b/tests/knr/guessnumber.d.ref @@ -0,0 +1,30 @@ +import std.stdio, std.random, std.typecons, std.conv, std.string, std.range; + +void main() +{ + immutable interval = tuple(1, 100); + writefln("Guess my target number that is between " ~ "%d and %d (inclusive).\n", interval[]); + immutable target = uniform!"[]"(interval[]); + + foreach (immutable i; sequence!q{n}) { + writef("Your guess #%d: ", i + 1); + immutable txt = stdin.readln.strip; + + Nullable!int answer; + try { + answer = txt.to!int; + } catch (ConvException e) { + writefln(" I don't understand your input '%s'", txt); + continue; + } + if (answer < interval[0] || answer > interval[1]) { + writeln(" Out of range!"); + continue; + } + if (answer == target) { + writeln(" Well guessed."); + break; + } + writeln(answer < target ? " Too low." : " Too high."); + } +} diff --git a/tests/knr/hello.d.ref b/tests/knr/hello.d.ref new file mode 100644 index 0000000..0beb9aa --- /dev/null +++ b/tests/knr/hello.d.ref @@ -0,0 +1,6 @@ +import std.stdio; + +void main() +{ + writeln("Hello, world without explicit compilations!"); +} diff --git a/tests/knr/higherorder.d.ref b/tests/knr/higherorder.d.ref new file mode 100644 index 0000000..be9b953 --- /dev/null +++ b/tests/knr/higherorder.d.ref @@ -0,0 +1,12 @@ +int hof(int a, int b, int delegate(int, int) f) +{ + return f(a, b); +} + +void main() +{ + import std.stdio; + + writeln("Add: ", hof(2, 3, (a, b) => a + b)); + writeln("Multiply: ", hof(2, 3, (a, b) => a * b)); +} diff --git a/tests/knr/issue0017.d.ref b/tests/knr/issue0017.d.ref new file mode 100644 index 0000000..541c22a --- /dev/null +++ b/tests/knr/issue0017.d.ref @@ -0,0 +1,4 @@ +immutable NameId[] namesA = [ + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS +]; diff --git a/tests/knr/issue0018.d.ref b/tests/knr/issue0018.d.ref new file mode 100644 index 0000000..2e7d77c --- /dev/null +++ b/tests/knr/issue0018.d.ref @@ -0,0 +1,5 @@ +import core.stdc.ctype; + +/********************************************* + * + */ diff --git a/tests/knr/issue0021.d.ref b/tests/knr/issue0021.d.ref new file mode 100644 index 0000000..ed28391 --- /dev/null +++ b/tests/knr/issue0021.d.ref @@ -0,0 +1,9 @@ +void func() +{ + if (!negative) + return this; + else if (a.negative) + return max(); + else + return a.value == 0 ? a : this; +} diff --git a/tests/knr/issue0022.d.ref b/tests/knr/issue0022.d.ref new file mode 100644 index 0000000..81c0d3b --- /dev/null +++ b/tests/knr/issue0022.d.ref @@ -0,0 +1,5 @@ +struct X { + ~this() + { + } +} diff --git a/tests/knr/issue0023.d.d.ref b/tests/knr/issue0023.d.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/knr/issue0023.d.ref b/tests/knr/issue0023.d.ref new file mode 100644 index 0000000..64e52e3 --- /dev/null +++ b/tests/knr/issue0023.d.ref @@ -0,0 +1,36 @@ +string generateFixedLengthCases() +{ + int[] shortList = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + + something[] items = [ + one, two, three, four, five, six, seven, eight, nine, ten, eleven, + twelve, thirteen, fourteen + ]; + + string[] fixedLengthTokens = [ + "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", + "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", + "char", "class", "const", "continue", "creal", "dchar", "debug", "default", + "delegate", "delete", "deprecated", "do", "double", "else", "enum", + "export", "extern", "false", "final", "finally", "float", "for", "foreach", + "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", + "immutable", "import", "in", "inout", "int", "interface", "invariant", + "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", + "nothrow", "null", "out", "override", "package", "pragma", "private", + "protected", "public", "pure", "real", "ref", "return", "scope", "shared", + "short", "static", "struct", "super", "switch", "synchronized", "template", + "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", + "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void", + "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", + "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", + "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", + "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VERSION__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" + ]; + +} diff --git a/tests/knr/issue0024.d.ref b/tests/knr/issue0024.d.ref new file mode 100644 index 0000000..ca5ade0 --- /dev/null +++ b/tests/knr/issue0024.d.ref @@ -0,0 +1,4 @@ +complex_t opMul_r(real x) +{ + return complex_t(x) * this; +} diff --git a/tests/knr/issue0025.d.ref b/tests/knr/issue0025.d.ref new file mode 100644 index 0000000..eac4846 --- /dev/null +++ b/tests/knr/issue0025.d.ref @@ -0,0 +1,4 @@ +complex_t opMul(real y) +{ + return this * complex_t(y); +} diff --git a/tests/knr/issue0026.d.ref b/tests/knr/issue0026.d.ref new file mode 100644 index 0000000..902bfd9 --- /dev/null +++ b/tests/knr/issue0026.d.ref @@ -0,0 +1 @@ +extern (C++) int HtmlNamedEntity(const(char)* p, size_t length); diff --git a/tests/knr/issue0027.d.ref b/tests/knr/issue0027.d.ref new file mode 100644 index 0000000..cfa0a90 --- /dev/null +++ b/tests/knr/issue0027.d.ref @@ -0,0 +1,46 @@ +SignExtendedNumber opMul(const SignExtendedNumber a) const +{ + // like 0x10 * 0x10 == 0x100 == 0. + + /* Special handling for zeros: + */ +} + +unittest { + if (Port.isNan(r1) || Port.isNan(r2)) // if unordered + { + } + + while (cur && cur.ty == Tsarray) // sizes of dimensions + { + TypeSArray sa = cast(TypeSArray) cur; + mangleNumber(sa.dim ? sa.dim.toInteger() : 0); + cur = cur.nextOf(); + } + + if (fd) { + /* Use storage_class2 instead of storage_class otherwise when we do .di generation + * we'll wind up with 'const const' rather than 'const'. + */ + /* Don't think we need to worry about mutually exclusive storage classes here + */ + fd.storage_class2 |= stc; + } + +} + +SignExtendedNumber opMul(const SignExtendedNumber a) const +{ + /* Special handling for zeros: + */ + + // like 0x10 * 0x10 == 0x100 == 0. +} + +// Because int64_t and friends may be any integral type of the +// correct size, we have to explicitly ask for the correct +// integer type to get the correct mangling with ddmd + +// Be careful not to care about sign when using dinteger_t +// use this instead of integer_t to +// avoid conflicts with system #include's diff --git a/tests/knr/issue0028.d.ref b/tests/knr/issue0028.d.ref new file mode 100644 index 0000000..c96ee7b --- /dev/null +++ b/tests/knr/issue0028.d.ref @@ -0,0 +1,16 @@ +unittest { + if (imin.value > 0x10FFFFUL) // ?? + imin.value = 0x10FFFFUL; // ?? + with (stuff) switch (a) { + case a: + doStuff(); + break; + } + switch (a) { + } + if (something) /** whatever */ + doStuff(); + if (something) /+ comment +/ { + doStuff(); + } +} diff --git a/tests/knr/issue0029.d.ref b/tests/knr/issue0029.d.ref new file mode 100644 index 0000000..43327e0 --- /dev/null +++ b/tests/knr/issue0029.d.ref @@ -0,0 +1,3 @@ +unittest { + char** buf = cast(char**) mem.xmalloc(dim * (char*).sizeof); +} diff --git a/tests/knr/issue0030.d.ref b/tests/knr/issue0030.d.ref new file mode 100644 index 0000000..d4c8ba0 --- /dev/null +++ b/tests/knr/issue0030.d.ref @@ -0,0 +1,3 @@ +unittest { + tolower(*p); +} diff --git a/tests/knr/issue0031.d.ref b/tests/knr/issue0031.d.ref new file mode 100644 index 0000000..c9ea8ef --- /dev/null +++ b/tests/knr/issue0031.d.ref @@ -0,0 +1,6 @@ +import std.stdio : writeln; + +void main() +{ + writeln(cast(dchar)uint.max); +} diff --git a/tests/knr/issue0032.d.ref b/tests/knr/issue0032.d.ref new file mode 100644 index 0000000..9a6f97c --- /dev/null +++ b/tests/knr/issue0032.d.ref @@ -0,0 +1,7 @@ +SignExtendedNumber opSub(const SignExtendedNumber a) const +{ + if (a.isMinimum()) + return negative ? SignExtendedNumber(value, false) : max(); + else + return this + (-a); +} diff --git a/tests/knr/issue0033.d.ref b/tests/knr/issue0033.d.ref new file mode 100644 index 0000000..6595e59 --- /dev/null +++ b/tests/knr/issue0033.d.ref @@ -0,0 +1,14 @@ +static IntRange fromType(Type type, bool isUnsigned) +{ + if (type.toBasetype().ty == Tdchar) + upper.value = 0x10FFFFUL; + else if (!isUnsigned) { + lower.value = ~(mask >> 1); + lower.value = ~(mask >> 1); + lower.negative = true; + upper.value = (mask >> 1); + } + uinteger_t minHalfChunk = imin.value & ~halfChunkMask; + uinteger_t maxHalfChunk = imax.value & ~halfChunkMask; + return IntRange(lower, upper); +} diff --git a/tests/knr/issue0034.d.ref b/tests/knr/issue0034.d.ref new file mode 100644 index 0000000..f2a1838 --- /dev/null +++ b/tests/knr/issue0034.d.ref @@ -0,0 +1,10 @@ +unittest { + if (a.value == 0) { + if (a.negative) + return SignExtendedNumber(value == 0 && negative); + else + return extreme(negative); + } + + uinteger_t aAbs = copySign(a.value, a.negative); +} diff --git a/tests/knr/issue0035.d.ref b/tests/knr/issue0035.d.ref new file mode 100644 index 0000000..0394671 --- /dev/null +++ b/tests/knr/issue0035.d.ref @@ -0,0 +1,5 @@ +unittest { + if (some_very_long_expression && some_very_long_expression && + some_very_long_expression && some_very_long_expression && some_very_long_expression) { + } +} diff --git a/tests/knr/issue0037.d.ref b/tests/knr/issue0037.d.ref new file mode 100644 index 0000000..f9c8d79 --- /dev/null +++ b/tests/knr/issue0037.d.ref @@ -0,0 +1,15 @@ +class U { +private: + unittest { + Label: + int a = 0; + } +} + +unittest { + loop: while (true) { + doStuff(); + } +Label: { + } +} diff --git a/tests/knr/issue0038.d.ref b/tests/knr/issue0038.d.ref new file mode 100644 index 0000000..97d7dc8 --- /dev/null +++ b/tests/knr/issue0038.d.ref @@ -0,0 +1,5 @@ +static int isInfinity(double r) +{ + auto a = r is double.infinity || r is -double.infinity; + auto b = r is double.infinity || r !is -double.infinity; +} diff --git a/tests/knr/issue0039.d.ref b/tests/knr/issue0039.d.ref new file mode 100644 index 0000000..206b331 --- /dev/null +++ b/tests/knr/issue0039.d.ref @@ -0,0 +1 @@ +version (AArch64) int x = 10; diff --git a/tests/knr/issue0041.d.ref b/tests/knr/issue0041.d.ref new file mode 100644 index 0000000..df92dd3 --- /dev/null +++ b/tests/knr/issue0041.d.ref @@ -0,0 +1,2 @@ +static if (is(typeof(T.init.apply(fp, null)))) { +} diff --git a/tests/knr/issue0042.d.ref b/tests/knr/issue0042.d.ref new file mode 100644 index 0000000..b5837e1 --- /dev/null +++ b/tests/knr/issue0042.d.ref @@ -0,0 +1,12 @@ +unittest { + version (Windows) + __locale_decpoint = save; +} + +unittest { + version (Windows) + __locale_decpoint = save; + else + __locale_decpoint = save; + version (Win32) int x; +} diff --git a/tests/knr/issue0043.d.ref b/tests/knr/issue0043.d.ref new file mode 100644 index 0000000..c749e7a --- /dev/null +++ b/tests/knr/issue0043.d.ref @@ -0,0 +1,13 @@ +unittest { + switch (something) with (stuff) { + case 1: + case 2: + label: + doStuff(); + case 3: .. case 4: + doOtherStuff(); + goto label; + default: + break; + } +} diff --git a/tests/knr/issue0044.d.ref b/tests/knr/issue0044.d.ref new file mode 100644 index 0000000..b7950c8 --- /dev/null +++ b/tests/knr/issue0044.d.ref @@ -0,0 +1,5 @@ +enum Sizeok : int { + SIZEOKnone, // size of aggregate is not computed yet + SIZEOKdone, // size of aggregate is set correctly + SIZEOKfwd, // error in computing size of aggregate +} diff --git a/tests/knr/issue0045.d.ref b/tests/knr/issue0045.d.ref new file mode 100644 index 0000000..405827c --- /dev/null +++ b/tests/knr/issue0045.d.ref @@ -0,0 +1,7 @@ +void doStuff() +{ + for (;;) { + } + for (size_t i = 0; i < se.len;) { + } +} diff --git a/tests/knr/issue0046.d.ref b/tests/knr/issue0046.d.ref new file mode 100644 index 0000000..fdc36ad --- /dev/null +++ b/tests/knr/issue0046.d.ref @@ -0,0 +1,13 @@ +class C { + void func() + { + switch (x) { + default: + assert(0); + } + } + + void main(string[] args) + { + } +} diff --git a/tests/knr/issue0047.d.ref b/tests/knr/issue0047.d.ref new file mode 100644 index 0000000..91a3bf4 --- /dev/null +++ b/tests/knr/issue0047.d.ref @@ -0,0 +1,29 @@ +unittest { + + FuncDeclaration* pFd = cast(FuncDeclaration*) dmd_aaGet(&arrayfuncs, cast(void*) ident); + FuncDeclaration fd = *pFd; + { + auto dd = new DtorDeclaration(declLoc, Loc(), stc, Identifier.idPool("__fieldDtor")); + auto dd = new DtorDeclaration(declLoc, Loc(), stc, extraParam, + midLengthFun(param, param), longIdentifier, Identifier.idPool("__fieldDtor")); + + memcpy(&saved_idents, &rvl.saved_idents, (const(char)*).sizeof * VC_SAVED_IDENT_CNT); + memcpy(&saved_types, &rvl.saved_types, (Type).sizeof * VC_SAVED_TYPE_CNT); + + auto ed = new EnumDeclaration(loc, ident, memtype ? memtype.syntaxCopy() : null); + } +} + +void doStuff(const Token[] tokens, ref const State current, + const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, int depth) +{ + return; +} + +unittest { + if (x) { + if (y) { + auto z = doCond(e.thisexp) || doCond(e.newargs) || doCond(e.arguments) || applyTo(e); + } + } +} diff --git a/tests/knr/issue0048.d.ref b/tests/knr/issue0048.d.ref new file mode 100644 index 0000000..d960f6e --- /dev/null +++ b/tests/knr/issue0048.d.ref @@ -0,0 +1,5 @@ +@Shortcut("[shift] + [tab]") +@MenuItem("Text/Decrease") +void textDecreaseIndent(BufferView v) +{ +} diff --git a/tests/knr/issue0049.d.ref b/tests/knr/issue0049.d.ref new file mode 100644 index 0000000..4be6943 --- /dev/null +++ b/tests/knr/issue0049.d.ref @@ -0,0 +1,11 @@ +void main(string[] args) +{ + switch (value) { + case 0: + return null; + case 1: + // Indented comment + /* fall through */ + default: + } +} diff --git a/tests/knr/issue0050.d.ref b/tests/knr/issue0050.d.ref new file mode 100644 index 0000000..58f7328 --- /dev/null +++ b/tests/knr/issue0050.d.ref @@ -0,0 +1,19 @@ +void fun() +{ + if (something) + foreach (_; 0 .. 100) + if (true) { + if (stuff) + doStuff(); + else + morestuff(); + } else + doStuff(); + + cast(structalign_t) 1; + for (*cost = 0; sc; sc = sc.enclosing, (*cost)++) + if (sc.scopesym == scopesym) + break; + else + a++; +} diff --git a/tests/knr/issue0051.d.ref b/tests/knr/issue0051.d.ref new file mode 100644 index 0000000..4b4ea73 --- /dev/null +++ b/tests/knr/issue0051.d.ref @@ -0,0 +1,12 @@ +void f() +{ + if (a) { + } else // wat + { + if (!is_temp_arg_ref) { + if (global.params.isOSX) + buf.writeByte('_'); + } + } + return; +} diff --git a/tests/knr/issue0052.d.ref b/tests/knr/issue0052.d.ref new file mode 100644 index 0000000..4816bf1 --- /dev/null +++ b/tests/knr/issue0052.d.ref @@ -0,0 +1,8 @@ +enum Flags : int { + IS_NOT_TOP_TYPE = 0x1, + MANGLE_RETURN_TYPE = 0x2, + IGNORE_CONST = 0x4, + IS_DMC = 0x8, +} + +auto a = [b, c, d,]; diff --git a/tests/knr/issue0053.d.ref b/tests/knr/issue0053.d.ref new file mode 100644 index 0000000..d595a7e --- /dev/null +++ b/tests/knr/issue0053.d.ref @@ -0,0 +1,11 @@ +enum DYNCAST : int { + DYNCAST_OBJECT, + DYNCAST_EXPRESSION, + DYNCAST_DSYMBOL, + DYNCAST_TYPE, + DYNCAST_IDENTIFIER, + DYNCAST_TUPLE, + DYNCAST_PARAMETER, +} + +alias MATCHnomatch = MATCH.MATCHnomatch; diff --git a/tests/knr/issue0054.d.ref b/tests/knr/issue0054.d.ref new file mode 100644 index 0000000..464dfb9 --- /dev/null +++ b/tests/knr/issue0054.d.ref @@ -0,0 +1,26 @@ +struct ClassFlags { + alias Type = uint; + enum Enum : int { + isCOMclass = 0x1, + noPointers = 0x2, + hasOffTi = 0x4, + hasCtor = 0x8, + hasGetMembers = 0x10, + hasTypeInfo = 0x20, + isAbstract = 0x40, + isCPPclass = 0x80, + hasDtor = 0x100, + + } + + alias isCOMclass = Enum.isCOMclass; + alias noPointers = Enum.noPointers; + alias hasOffTi = Enum.hasOffTi; + alias hasCtor = Enum.hasCtor; + alias hasGetMembers = Enum.hasGetMembers; + alias hasTypeInfo = Enum.hasTypeInfo; + alias isAbstract = Enum.isAbstract; + alias isCPPclass = Enum.isCPPclass; + alias hasDtor = Enum.hasDtor; + +} diff --git a/tests/knr/issue0056.d.ref b/tests/knr/issue0056.d.ref new file mode 100644 index 0000000..a707a88 --- /dev/null +++ b/tests/knr/issue0056.d.ref @@ -0,0 +1,16 @@ +unittest { + { + { + } + } + { + } + { + { + { + { + } + } + } + } +} diff --git a/tests/knr/issue0057.d.ref b/tests/knr/issue0057.d.ref new file mode 100644 index 0000000..f97cd04 --- /dev/null +++ b/tests/knr/issue0057.d.ref @@ -0,0 +1,14 @@ +~this() +{ +} + +extern (C++) ~this() +{ + global.gag = oldgag; +} + +struct S { + public ~this() + { + } +} diff --git a/tests/knr/issue0058.d.ref b/tests/knr/issue0058.d.ref new file mode 100644 index 0000000..547d359 --- /dev/null +++ b/tests/knr/issue0058.d.ref @@ -0,0 +1,9 @@ +/******************************************************** + * Helper function for checkAccess() + * Returns: + * false is not accessible + * true is accessible + */ +extern (C++) static bool isAccessible() +{ +} diff --git a/tests/knr/issue0059.d.ref b/tests/knr/issue0059.d.ref new file mode 100644 index 0000000..eb29149 --- /dev/null +++ b/tests/knr/issue0059.d.ref @@ -0,0 +1,13 @@ +extern (C++) FuncDeclaration buildXopEquals(StructDeclaration sd, Scope* sc) +{ + if (!needOpEquals(sd)) + return null; // bitwise comparison would work + //printf("StructDeclaration::buildXopEquals() %s\n", sd->toChars()); + if (Dsymbol eq = search_function(sd, Id.eq)) { + if (FuncDeclaration fd = eq.isFuncDeclaration()) { + TypeFunction tfeqptr; + { + } + } + } +} diff --git a/tests/knr/issue0060.d.ref b/tests/knr/issue0060.d.ref new file mode 100644 index 0000000..65e25c3 --- /dev/null +++ b/tests/knr/issue0060.d.ref @@ -0,0 +1,4 @@ +static if (a) { +} else static if (b) { +} else { +} diff --git a/tests/knr/issue0061.d.ref b/tests/knr/issue0061.d.ref new file mode 100644 index 0000000..8d3c642 --- /dev/null +++ b/tests/knr/issue0061.d.ref @@ -0,0 +1 @@ +const(char)*[VC_SAVED_IDENT_CNT] saved_idents; diff --git a/tests/knr/issue0062.d.ref b/tests/knr/issue0062.d.ref new file mode 100644 index 0000000..02ded66 --- /dev/null +++ b/tests/knr/issue0062.d.ref @@ -0,0 +1,5 @@ +unittest { + switch (op) { + return -1; // memory blocks are different + } +} diff --git a/tests/knr/issue0063.d.ref b/tests/knr/issue0063.d.ref new file mode 100644 index 0000000..e670eb6 --- /dev/null +++ b/tests/knr/issue0063.d.ref @@ -0,0 +1,4 @@ +import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, + ddmd.dmodule, ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, + ddmd.globals, ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, + ddmd.root.file, ddmd.root.rootobject, ddmd.statement; diff --git a/tests/knr/issue0064.d.ref b/tests/knr/issue0064.d.ref new file mode 100644 index 0000000..c62925a --- /dev/null +++ b/tests/knr/issue0064.d.ref @@ -0,0 +1,17 @@ +unittest { + return true; // +Lnomatch: + //printf("nomatch\n"); + return false; // nomatch; +} + +unittest { + if (x) + return true; +} + +unittest { + return true; // match +Lnomatch: //printf("nomatch\n"); + return false; // nomatch; +} diff --git a/tests/knr/issue0065.d.ref b/tests/knr/issue0065.d.ref new file mode 100644 index 0000000..4c5f443 --- /dev/null +++ b/tests/knr/issue0065.d.ref @@ -0,0 +1,7 @@ +void main(string[] args) +{ + if ((*tempdecl.parameters)[i].isTemplateThisParameter() is null) { + } + if (a() in b || a() is b) { + } +} diff --git a/tests/knr/issue0066.d.ref b/tests/knr/issue0066.d.ref new file mode 100644 index 0000000..8928906 --- /dev/null +++ b/tests/knr/issue0066.d.ref @@ -0,0 +1,8 @@ +int overloadApply(int function(void*, Dsymbol) fp) +{ +} + +void takesArray(int[]) +{ + doesntUseArray(); +} diff --git a/tests/knr/issue0067.d.ref b/tests/knr/issue0067.d.ref new file mode 100644 index 0000000..597acf0 --- /dev/null +++ b/tests/knr/issue0067.d.ref @@ -0,0 +1 @@ +alias Key = void*; diff --git a/tests/knr/issue0068.d.ref b/tests/knr/issue0068.d.ref new file mode 100644 index 0000000..084f9cb --- /dev/null +++ b/tests/knr/issue0068.d.ref @@ -0,0 +1,3 @@ +version (all) { +} else version (none) { +} diff --git a/tests/knr/issue0069.d.ref b/tests/knr/issue0069.d.ref new file mode 100644 index 0000000..994988a --- /dev/null +++ b/tests/knr/issue0069.d.ref @@ -0,0 +1,7 @@ +unittest { + if (0) { + L1: + if (0) { + } + } +} diff --git a/tests/knr/issue0070.d.ref b/tests/knr/issue0070.d.ref new file mode 100644 index 0000000..46d19e0 --- /dev/null +++ b/tests/knr/issue0070.d.ref @@ -0,0 +1,7 @@ +unittest { + if (0) + if (0) { + something(); + something_else(); + } +} diff --git a/tests/knr/issue0073.d.ref b/tests/knr/issue0073.d.ref new file mode 100644 index 0000000..6119049 --- /dev/null +++ b/tests/knr/issue0073.d.ref @@ -0,0 +1,7 @@ +void presumed(out uint column) @trusted +{ + CXString cxstring; + + clang_getPresumedLocation(cx, &cxstring, &line, &column); + filename = toD(cxstring); +} diff --git a/tests/knr/issue0074.d.ref b/tests/knr/issue0074.d.ref new file mode 100644 index 0000000..aec2963 --- /dev/null +++ b/tests/knr/issue0074.d.ref @@ -0,0 +1,13 @@ +@property bool isFunctionType() +{ + with (CXTypeKind) + return kind == CXType_FunctionNoProto || kind == CXType_FunctionProto + || // FIXME: This "hack" shouldn't be needed. + func.resultType.isValid; +} + +@property bool isFunctionPointerType() +{ + with (CXTypeKind) + return kind == CXType_Pointer && pointeeType.isFunctionType; +} diff --git a/tests/knr/issue0076.d.ref b/tests/knr/issue0076.d.ref new file mode 100644 index 0000000..9568ea5 --- /dev/null +++ b/tests/knr/issue0076.d.ref @@ -0,0 +1,5 @@ +unittest { +Label: + while (1) { + } +} diff --git a/tests/knr/issue0079.d.ref b/tests/knr/issue0079.d.ref new file mode 100644 index 0000000..f5c6553 --- /dev/null +++ b/tests/knr/issue0079.d.ref @@ -0,0 +1,8 @@ +unittest { + switch (x) { + case a: { + } + case b: + return; + } +} diff --git a/tests/knr/issue0080.d.ref b/tests/knr/issue0080.d.ref new file mode 100644 index 0000000..ae440b7 --- /dev/null +++ b/tests/knr/issue0080.d.ref @@ -0,0 +1,10 @@ +unittest { + switch (x) { + case a: + return; + version (A) { + case b: + return; + } + } +} diff --git a/tests/knr/issue0081.d.ref b/tests/knr/issue0081.d.ref new file mode 100644 index 0000000..532810f --- /dev/null +++ b/tests/knr/issue0081.d.ref @@ -0,0 +1,15 @@ +unittest { + if (0) + if (0) { + } else if (0) { + } else { + } + doSomething(); +} + +unittest { + if (0) + if (0) { + } + doSomething(); +} diff --git a/tests/knr/issue0082.d.ref b/tests/knr/issue0082.d.ref new file mode 100644 index 0000000..5206d17 --- /dev/null +++ b/tests/knr/issue0082.d.ref @@ -0,0 +1,10 @@ +unittest { +label: + if (x) { + } +Label: + + // comment + statement(); +} +} diff --git a/tests/knr/issue0083.d.ref b/tests/knr/issue0083.d.ref new file mode 100644 index 0000000..787506e --- /dev/null +++ b/tests/knr/issue0083.d.ref @@ -0,0 +1,5 @@ +bool contains(T item) +{ + asm pure nothrow @nogc { + } +} diff --git a/tests/knr/issue0085.d.ref b/tests/knr/issue0085.d.ref new file mode 100644 index 0000000..bc54606 --- /dev/null +++ b/tests/knr/issue0085.d.ref @@ -0,0 +1 @@ +alias T = typeof(return); diff --git a/tests/knr/issue0086.d.ref b/tests/knr/issue0086.d.ref new file mode 100644 index 0000000..fdb7297 --- /dev/null +++ b/tests/knr/issue0086.d.ref @@ -0,0 +1,22 @@ +unittest { + if (a) + if (b) + doSomething(); + doSomethingElse(); +} + +void indent() +{ + import std.range : repeat, take; + + if (config.useTabs) + foreach (i; 0 .. indentLevel + tempIndent) { + currentLineLength += config.tabSize; + output.put("\t"); + } else + foreach (i; 0 .. indentLevel + tempIndent) + foreach (j; 0 .. config.indentSize) { + output.put(" "); + currentLineLength++; + } +} diff --git a/tests/knr/issue0088.d.ref b/tests/knr/issue0088.d.ref new file mode 100644 index 0000000..4e8a338 --- /dev/null +++ b/tests/knr/issue0088.d.ref @@ -0,0 +1,7 @@ +unittest { + switch (x) { + case +1: + case -1: + case (1): + } +} diff --git a/tests/knr/issue0089.d.ref b/tests/knr/issue0089.d.ref new file mode 100644 index 0000000..b91fbde --- /dev/null +++ b/tests/knr/issue0089.d.ref @@ -0,0 +1,5 @@ +unittest { + if (x) + doSomething(); + //doSomethingElse(); +} diff --git a/tests/knr/issue0090.d.ref b/tests/knr/issue0090.d.ref new file mode 100644 index 0000000..16cb849 --- /dev/null +++ b/tests/knr/issue0090.d.ref @@ -0,0 +1,8 @@ +unittest { +L1: + switch (x) { + case Case: + doSomething(); + doSomethingElse(); + } +} diff --git a/tests/knr/issue0091.d.ref b/tests/knr/issue0091.d.ref new file mode 100644 index 0000000..89ff419 --- /dev/null +++ b/tests/knr/issue0091.d.ref @@ -0,0 +1,10 @@ +unittest { + switch (x) { + version (none) { + x(); + case Case: + doSomething(); + doSomethingElse(); + } + } +} diff --git a/tests/knr/issue0092.d.ref b/tests/knr/issue0092.d.ref new file mode 100644 index 0000000..52fc7a0 --- /dev/null +++ b/tests/knr/issue0092.d.ref @@ -0,0 +1,15 @@ +unittest { + switch (cast(uint) sz) { + case 3: + if (!global.params.is64bit) + goto Lmemory; + case 4: + t1 = Type.tint32; + break; + case 5: + if (!global.params.is64bit) + goto Lmemory; + default: + break; + } +} diff --git a/tests/knr/issue0093.d.ref b/tests/knr/issue0093.d.ref new file mode 100644 index 0000000..4188bc2 --- /dev/null +++ b/tests/knr/issue0093.d.ref @@ -0,0 +1,7 @@ +unittest { + if (x) { + version (none) { + } else { + } + } +} diff --git a/tests/knr/issue0094.d.ref b/tests/knr/issue0094.d.ref new file mode 100644 index 0000000..0a70537 --- /dev/null +++ b/tests/knr/issue0094.d.ref @@ -0,0 +1,6 @@ +void test() +{ + fun((int x) { writeln(x); }, (int x) { writeln(x); }); + + return; +} diff --git a/tests/knr/issue0095.d.ref b/tests/knr/issue0095.d.ref new file mode 100644 index 0000000..453b074 --- /dev/null +++ b/tests/knr/issue0095.d.ref @@ -0,0 +1,6 @@ +unittest { + if (!fdmatch) + goto Lfd; + { + } +} diff --git a/tests/knr/issue0096.d.ref b/tests/knr/issue0096.d.ref new file mode 100644 index 0000000..441e7d9 --- /dev/null +++ b/tests/knr/issue0096.d.ref @@ -0,0 +1,13 @@ +version (Windows) void func(); +version (Windows) + void func(); +else + void func(); +version (Windows) { + void func(); +} +version (Windows) { + void func(); +} else { + void func(); +} diff --git a/tests/knr/issue0097.d.ref b/tests/knr/issue0097.d.ref new file mode 100644 index 0000000..c43ea0d --- /dev/null +++ b/tests/knr/issue0097.d.ref @@ -0,0 +1,33 @@ +unittest { + switch (x) { + case 0: + version (none) { + // Comment + case '\n': + break; + } + } +} + +unittest { + switch (x) { + case 0: { + Label: while (1) { + } + break; + } + Label2: + doStuff(); + } +} + +unittest { + switch (a) { + case a: + doStuff(); + doOtherStuff(); + break; + default: + break; + } +} diff --git a/tests/knr/issue0098.d.ref b/tests/knr/issue0098.d.ref new file mode 100644 index 0000000..ecb4ff9 --- /dev/null +++ b/tests/knr/issue0098.d.ref @@ -0,0 +1,6 @@ +unittest { + if (!fdmatch) + goto Lfd; // comment + { + } +} diff --git a/tests/knr/issue0099.d.ref b/tests/knr/issue0099.d.ref new file mode 100644 index 0000000..b615aa9 --- /dev/null +++ b/tests/knr/issue0099.d.ref @@ -0,0 +1,31 @@ +unittest { + if (a) { + if (b) + if (c) { + if (excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName) + excessivelyLongFunctionName(true); + else { + excessivelyLongFunctionName(false); + } + } else + a(); + } +} + +unittest { + if (a) { + if (b) { + if (c) { + if (excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName) + excessivelyLongFunctionName(true); + else { + excessivelyLongFunctionName(false); + } + } + } + } +} diff --git a/tests/knr/issue0100.d.ref b/tests/knr/issue0100.d.ref new file mode 100644 index 0000000..15f5cfa --- /dev/null +++ b/tests/knr/issue0100.d.ref @@ -0,0 +1,12 @@ +unittest { + loop: while (i < tokens.length) switch (tokens[i].type) { + case tok!"(": + parenDepth++; + i++; + break; + case tok!"{": + braceDepth++; + i++; + break; + } +} diff --git a/tests/knr/issue0101.d.ref b/tests/knr/issue0101.d.ref new file mode 100644 index 0000000..5d2e5fc --- /dev/null +++ b/tests/knr/issue0101.d.ref @@ -0,0 +1,9 @@ +#! /usr/bin/env rdmd + +import std.stdio : writeln; + +int main(immutable string[] args) +{ + writeln("Hello World!"); + return 0; +} diff --git a/tests/knr/issue0102.d.ref b/tests/knr/issue0102.d.ref new file mode 100644 index 0000000..8efd670 --- /dev/null +++ b/tests/knr/issue0102.d.ref @@ -0,0 +1 @@ +import std.stdio: stderr; diff --git a/tests/knr/issue0106.d.ref b/tests/knr/issue0106.d.ref new file mode 100644 index 0000000..9045b4f --- /dev/null +++ b/tests/knr/issue0106.d.ref @@ -0,0 +1,2 @@ +enum : int { +} diff --git a/tests/knr/issue0107.d.ref b/tests/knr/issue0107.d.ref new file mode 100644 index 0000000..045f087 --- /dev/null +++ b/tests/knr/issue0107.d.ref @@ -0,0 +1,14 @@ +void msgpackToGValue(MsgValue input) +{ + with (MsgValue.Type) switch (input.type) { + case boolean: + a(); + break; + case unsigned: + b(); + break; + default: + assert(false); + } + return retVal; +} diff --git a/tests/knr/issue0108.d.ref b/tests/knr/issue0108.d.ref new file mode 100644 index 0000000..1c120a1 --- /dev/null +++ b/tests/knr/issue0108.d.ref @@ -0,0 +1,10 @@ +unittest { + with (SomeEnum) final switch (value) { + case a: + aa(); + break; + case b: + bb(); + break; + } +} diff --git a/tests/knr/issue0109.d.ref b/tests/knr/issue0109.d.ref new file mode 100644 index 0000000..43e04fc --- /dev/null +++ b/tests/knr/issue0109.d.ref @@ -0,0 +1,5 @@ +unittest { + sourceLoop: for (; childCodes.length > 0 && sourceListStore.iterIsValid(sourceIter); + sourceListStore.iterNext(sourceIter)) { + } +} diff --git a/tests/knr/issue0111.d.ref b/tests/knr/issue0111.d.ref new file mode 100644 index 0000000..3f13a34 --- /dev/null +++ b/tests/knr/issue0111.d.ref @@ -0,0 +1,7 @@ +struct Test { + this(string name, string[] aliasList, string briefDescription, string examDesc, string onOpenDesc, + string openDesc, string onCloseDesc, string closeDesc, + Flag!"canOpen" canOpen, Flag!"canClose" canClose, Flag!"isOpen" isOpen) + { + } +} diff --git a/tests/knr/issue0112.d.ref b/tests/knr/issue0112.d.ref new file mode 100644 index 0000000..6977857 --- /dev/null +++ b/tests/knr/issue0112.d.ref @@ -0,0 +1,13 @@ +unittest { + testScene = new Scene("TestScene : Test", sceneDescriptions["TestScene"], + connectDescriptions["TestScene"], delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/knr/issue0112_variation.d.ref b/tests/knr/issue0112_variation.d.ref new file mode 100644 index 0000000..424c1dd --- /dev/null +++ b/tests/knr/issue0112_variation.d.ref @@ -0,0 +1,13 @@ +unittest { + testScene = new Scene(longArgument, longArgument, longArgument, + longArgument, longArgument, longArgument, delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/knr/issue0114.d.ref b/tests/knr/issue0114.d.ref new file mode 100644 index 0000000..ae34f97 --- /dev/null +++ b/tests/knr/issue0114.d.ref @@ -0,0 +1,4 @@ +private { + import std.process; + import std.c.windows.windows; +} diff --git a/tests/knr/issue0116.d.ref b/tests/knr/issue0116.d.ref new file mode 100644 index 0000000..c8b6a99 --- /dev/null +++ b/tests/knr/issue0116.d.ref @@ -0,0 +1,7 @@ +static assert(!is(T : int)); + +unittest { + foo(!is(T : int)); +} + +enum a(T) = !is(T : int); diff --git a/tests/knr/issue0117.d.ref b/tests/knr/issue0117.d.ref new file mode 100644 index 0000000..d6fa3cb --- /dev/null +++ b/tests/knr/issue0117.d.ref @@ -0,0 +1,6 @@ +struct A { + int i; // Comment + ~this() + { + } +} diff --git a/tests/knr/issue0118.d.ref b/tests/knr/issue0118.d.ref new file mode 100644 index 0000000..c27fb60 --- /dev/null +++ b/tests/knr/issue0118.d.ref @@ -0,0 +1,14 @@ +auto foo = bar(1, 1, 1); +auto foo = A!(int, int, int); +enum foo = bar(1, 1, 1); +enum foo = A!(int, int, int); + +enum bar { + a = Struct(a, b, c), + b = Struct(d, e, f) +} + +enum bar { + a = Struct(a, b, c), + b = Struct(d, e, f), +} diff --git a/tests/knr/issue0119.d.ref b/tests/knr/issue0119.d.ref new file mode 100644 index 0000000..9f0d8d1 --- /dev/null +++ b/tests/knr/issue0119.d.ref @@ -0,0 +1,24 @@ +auto fun = function() {}; +auto fun = () {}; +auto fun = {}; + +auto fun = { int i; }; + +auto fun = { int i; int i; int i; int i; }; + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/knr/issue0120.d.ref b/tests/knr/issue0120.d.ref new file mode 100644 index 0000000..c3b6313 --- /dev/null +++ b/tests/knr/issue0120.d.ref @@ -0,0 +1,3 @@ +auto fun = { + int i; // Comment +}; diff --git a/tests/knr/issue0123.d.ref b/tests/knr/issue0123.d.ref new file mode 100644 index 0000000..e91a9c8 --- /dev/null +++ b/tests/knr/issue0123.d.ref @@ -0,0 +1,6 @@ +struct State { + this(uint breaks, const Token[] tokens, immutable short[] depths, + const Config* config, int currentLineLength, int indentLevel) pure @safe + { + } +} diff --git a/tests/knr/issue0125.d.ref b/tests/knr/issue0125.d.ref new file mode 100644 index 0000000..ce47f77 --- /dev/null +++ b/tests/knr/issue0125.d.ref @@ -0,0 +1,11 @@ +void main(string[] args) +{ + // dfmt off + getopt(args, + "optionOne", &optionOne, + "optionTwo", &optionTwo, + "optionThree", &optionThree); + // dfmt on + + getopt(args, "optionOne", &optionOne, "optionTwo", &optionTwo, "optionThree", &optionThree); +} diff --git a/tests/knr/issue0126.d.ref b/tests/knr/issue0126.d.ref new file mode 100644 index 0000000..a79c876 --- /dev/null +++ b/tests/knr/issue0126.d.ref @@ -0,0 +1,6 @@ +unittest { + try + doStuff(); + catch (Exception ex) + complain(ex.msg); +} diff --git a/tests/knr/issue0127.d.ref b/tests/knr/issue0127.d.ref new file mode 100644 index 0000000..a6b95af --- /dev/null +++ b/tests/knr/issue0127.d.ref @@ -0,0 +1,4 @@ +version (Windows) + enum root = `C:\`; +else + enum root = "/"; diff --git a/tests/knr/issue0128.d.ref b/tests/knr/issue0128.d.ref new file mode 100644 index 0000000..0b1261c --- /dev/null +++ b/tests/knr/issue0128.d.ref @@ -0,0 +1,4 @@ +unittest { + string[string] aa = ["a" : "b"]; + auto x = "a" in aa; +} diff --git a/tests/knr/issue0130.d.ref b/tests/knr/issue0130.d.ref new file mode 100644 index 0000000..616293a --- /dev/null +++ b/tests/knr/issue0130.d.ref @@ -0,0 +1,10 @@ +class SomeClass { + public: + int x; + int y; + private: + int z; +} + +public: + void doStuff(); diff --git a/tests/knr/issue0134.d.ref b/tests/knr/issue0134.d.ref new file mode 100644 index 0000000..9d10648 --- /dev/null +++ b/tests/knr/issue0134.d.ref @@ -0,0 +1,14 @@ +void foo() +{ + string command; + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + unittest { + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/knr/issue0136.d.ref b/tests/knr/issue0136.d.ref new file mode 100644 index 0000000..9f04038 --- /dev/null +++ b/tests/knr/issue0136.d.ref @@ -0,0 +1,3 @@ +unittest { + auto result = name !in aa; +} diff --git a/tests/knr/issue0138.d.ref b/tests/knr/issue0138.d.ref new file mode 100644 index 0000000..4f1d05b --- /dev/null +++ b/tests/knr/issue0138.d.ref @@ -0,0 +1,7 @@ +unittest { + auto result = a[0] in aa; +} + +void doStuff(in int a, in int b) +{ +} diff --git a/tests/knr/issue0139.d.ref b/tests/knr/issue0139.d.ref new file mode 100644 index 0000000..938bb75 --- /dev/null +++ b/tests/knr/issue0139.d.ref @@ -0,0 +1,24 @@ +void foo(auto in a, auto out int b) const +out { + assert(true); +} +body { +} + +void foo() const +in { +} +out { + assert(true); +} +body { +} + +void foo() const +in { +} +out (result) { + assert(true); +} +body { +} diff --git a/tests/knr/issue0140.d.ref b/tests/knr/issue0140.d.ref new file mode 100644 index 0000000..471bf96 --- /dev/null +++ b/tests/knr/issue0140.d.ref @@ -0,0 +1,5 @@ +class C { + + int foo; + +} diff --git a/tests/knr/issue0142.d.ref b/tests/knr/issue0142.d.ref new file mode 100644 index 0000000..0ff0108 --- /dev/null +++ b/tests/knr/issue0142.d.ref @@ -0,0 +1,3 @@ +class Bar(A) : Foo if (isFloating!A) { + +} diff --git a/tests/knr/issue0146.d.ref b/tests/knr/issue0146.d.ref new file mode 100644 index 0000000..9854d89 --- /dev/null +++ b/tests/knr/issue0146.d.ref @@ -0,0 +1 @@ +alias FooFactory = Foo delegate(); diff --git a/tests/knr/issue0147.d.ref b/tests/knr/issue0147.d.ref new file mode 100644 index 0000000..df7761e --- /dev/null +++ b/tests/knr/issue0147.d.ref @@ -0,0 +1 @@ +import ae.utils.meta : singleton, I; diff --git a/tests/knr/issue0148.d.ref b/tests/knr/issue0148.d.ref new file mode 100644 index 0000000..9b4cb05 --- /dev/null +++ b/tests/knr/issue0148.d.ref @@ -0,0 +1,6 @@ +class Foo { + @property Socket socket() + { + return this.socket; + } +} diff --git a/tests/knr/issue0150.d.ref b/tests/knr/issue0150.d.ref new file mode 100644 index 0000000..c4a484c --- /dev/null +++ b/tests/knr/issue0150.d.ref @@ -0,0 +1,5 @@ +void main() +{ + scope (success) { + } +} diff --git a/tests/knr/issue0151.d.ref b/tests/knr/issue0151.d.ref new file mode 100644 index 0000000..639e6bb --- /dev/null +++ b/tests/knr/issue0151.d.ref @@ -0,0 +1,7 @@ +void test() +{ /* ignore */ } + +void test2() +{ + test(); +} diff --git a/tests/knr/issue0152.d.ref b/tests/knr/issue0152.d.ref new file mode 100644 index 0000000..d6a32a2 --- /dev/null +++ b/tests/knr/issue0152.d.ref @@ -0,0 +1 @@ +enum IsPathHandler(alias T) = is(PathHandler == typeof(T)); diff --git a/tests/knr/issue0153.d.ref b/tests/knr/issue0153.d.ref new file mode 100644 index 0000000..86bbf90 --- /dev/null +++ b/tests/knr/issue0153.d.ref @@ -0,0 +1,6 @@ +class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName + if (is(T : Bar)) { + void foo() + { + } +} diff --git a/tests/knr/issue0154.d.ref b/tests/knr/issue0154.d.ref new file mode 100644 index 0000000..14d242d --- /dev/null +++ b/tests/knr/issue0154.d.ref @@ -0,0 +1,5 @@ +class Foo(T) if (is(T : Bar) && is(T : Baz)) { +} + +class Foo(T) if (is(T : Bar) || is(T : Baz)) { +} diff --git a/tests/knr/issue0155.d.ref b/tests/knr/issue0155.d.ref new file mode 100644 index 0000000..ee25a4d --- /dev/null +++ b/tests/knr/issue0155.d.ref @@ -0,0 +1,3 @@ +import foo; +public import bar; +import baz; diff --git a/tests/knr/issue0156.d.ref b/tests/knr/issue0156.d.ref new file mode 100644 index 0000000..01b5abd --- /dev/null +++ b/tests/knr/issue0156.d.ref @@ -0,0 +1,7 @@ +class C { + int foo() const + out (bar) { + } + body { + } +} diff --git a/tests/knr/issue0158.d.ref b/tests/knr/issue0158.d.ref new file mode 100644 index 0000000..c81b98e --- /dev/null +++ b/tests/knr/issue0158.d.ref @@ -0,0 +1,6 @@ +@Foo enum Bar { + a +} + +@foo class Baz { +} diff --git a/tests/knr/issue0162.d.ref b/tests/knr/issue0162.d.ref new file mode 100644 index 0000000..cc9715b --- /dev/null +++ b/tests/knr/issue0162.d.ref @@ -0,0 +1,8 @@ +void foo(int foobarbazqux1, /* */ + int foobarbazqux2, /* */ + int foobarbazqux3, /* */ + int foobarbazqux4, /* */ + int foobarbazqux5, /* */ + int foobarbazqux6, /* */ + int foobarbazqux7 /* */ +); diff --git a/tests/knr/issue0166.d.ref b/tests/knr/issue0166.d.ref new file mode 100644 index 0000000..f1d209f --- /dev/null +++ b/tests/knr/issue0166.d.ref @@ -0,0 +1,9 @@ +void foo() +{ // + void bar() + { // + baz({ // + qux(); // + }); // + } // +} // diff --git a/tests/knr/issue0169.d.ref b/tests/knr/issue0169.d.ref new file mode 100644 index 0000000..6d99247 --- /dev/null +++ b/tests/knr/issue0169.d.ref @@ -0,0 +1,10 @@ +unittest { + if (true) { + if (true) // comment + { + + } else { + + } + } +} diff --git a/tests/knr/issue0172.d.ref b/tests/knr/issue0172.d.ref new file mode 100644 index 0000000..b50c1b3 --- /dev/null +++ b/tests/knr/issue0172.d.ref @@ -0,0 +1,6 @@ +final class FormatVisitor : ASTVisitor { + this(ASTInformation* astInformation) + { + this.astInformation = astInformation; + } +} diff --git a/tests/knr/issue0174.d.ref b/tests/knr/issue0174.d.ref new file mode 100644 index 0000000..1a95194 --- /dev/null +++ b/tests/knr/issue0174.d.ref @@ -0,0 +1,5 @@ +void merge() +{ + static if (is(T == enum)) + *thisN = x; +} diff --git a/tests/knr/issue0177.d.ref b/tests/knr/issue0177.d.ref new file mode 100644 index 0000000..c2bbe3c --- /dev/null +++ b/tests/knr/issue0177.d.ref @@ -0,0 +1,26 @@ +unittest { + { + } + // + { + } +} + +unittest { + { + } + // + + { + } +} + +unittest { + { + } + + // + + { + } +} diff --git a/tests/knr/issue0185.d.ref b/tests/knr/issue0185.d.ref new file mode 100644 index 0000000..8932e46 --- /dev/null +++ b/tests/knr/issue0185.d.ref @@ -0,0 +1,12 @@ +unittest { + do + ++a; + while (true); +} + +unittest { + do { + ++a; + } + while (true); +} diff --git a/tests/knr/issue0186.d.ref b/tests/knr/issue0186.d.ref new file mode 100644 index 0000000..952a8af --- /dev/null +++ b/tests/knr/issue0186.d.ref @@ -0,0 +1,23 @@ +void functionName() +{ + +} + +void main() +{ + static if (true) { + if (true && { + functionName(); + functionName(); + functionName(); + functionName(); + return true; + }()) { + + } else { + + } + } else { + + } +} diff --git a/tests/knr/issue0187.d.ref b/tests/knr/issue0187.d.ref new file mode 100644 index 0000000..ee3cdbf --- /dev/null +++ b/tests/knr/issue0187.d.ref @@ -0,0 +1,3 @@ +void doStuff(T)() @safe if (isNumeric!T) +{ +} diff --git a/tests/knr/issue0189.d.ref b/tests/knr/issue0189.d.ref new file mode 100644 index 0000000..ff680f2 --- /dev/null +++ b/tests/knr/issue0189.d.ref @@ -0,0 +1,17 @@ +unittest { + Test("Something") in { + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + }; +} + +void aFunction(ParamType param) +in { + assert(stuff); +} +body { +} diff --git a/tests/knr/issue0190.d.ref b/tests/knr/issue0190.d.ref new file mode 100644 index 0000000..ed0d398 --- /dev/null +++ b/tests/knr/issue0190.d.ref @@ -0,0 +1,6 @@ +unittest { + asm { + dl 12345; + movdqu [R8], XMM0; + } +} diff --git a/tests/knr/issue0194.d.ref b/tests/knr/issue0194.d.ref new file mode 100644 index 0000000..6311e9a --- /dev/null +++ b/tests/knr/issue0194.d.ref @@ -0,0 +1,10 @@ +module test; + +void main() +{ + test("stringLiteral") in { + foreach (thing; things) { + doStuff(thing); + } + }; +} diff --git a/tests/knr/issue0195.d.ref b/tests/knr/issue0195.d.ref new file mode 100644 index 0000000..bfd97c3 --- /dev/null +++ b/tests/knr/issue0195.d.ref @@ -0,0 +1,15 @@ +void main() +{ + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; l) { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/knr/issue0204.d.ref b/tests/knr/issue0204.d.ref new file mode 100644 index 0000000..adab749 --- /dev/null +++ b/tests/knr/issue0204.d.ref @@ -0,0 +1,10 @@ +version (Foo) { + version (D_Version2) { + public import core.memory; + } else: +} + +version (Bar) + int foo(); +else: + int foo(int); diff --git a/tests/knr/issue0205.d.ref b/tests/knr/issue0205.d.ref new file mode 100644 index 0000000..a7f02f6 --- /dev/null +++ b/tests/knr/issue0205.d.ref @@ -0,0 +1,6 @@ +unittest { + asm { + } + d[] = a[]; + c[] = d[]; +} diff --git a/tests/knr/issue0206.d.ref b/tests/knr/issue0206.d.ref new file mode 100644 index 0000000..b0ec36a --- /dev/null +++ b/tests/knr/issue0206.d.ref @@ -0,0 +1,7 @@ +unittest { + import std.stdio : stderr; + + { + a = 10; + } +} diff --git a/tests/knr/issue0207.d.ref b/tests/knr/issue0207.d.ref new file mode 100644 index 0000000..5b779d8 --- /dev/null +++ b/tests/knr/issue0207.d.ref @@ -0,0 +1,10 @@ +enum a { + a, + b, + c, + d, + /* a comment */ + e, + f, + g +} diff --git a/tests/knr/issue0208.d.ref b/tests/knr/issue0208.d.ref new file mode 100644 index 0000000..379e02c --- /dev/null +++ b/tests/knr/issue0208.d.ref @@ -0,0 +1,5 @@ +unittest { + if (a && !is(b == q)) { + + } +} diff --git a/tests/knr/issue0209.d.ref b/tests/knr/issue0209.d.ref new file mode 100644 index 0000000..1bcfcd6 --- /dev/null +++ b/tests/knr/issue0209.d.ref @@ -0,0 +1,18 @@ +unittest { + { + public Vector!(T) opBinary(string op, string file = __FILE__, size_t line = __LINE__)( + const Vector!(T) x) const if (op == "*") + in { + } + body { + } + + } +} + +public Vector!(T) opBinary(string op, string file = __FILE__, size_t line = __LINE__)( + const Vector!(T) x) const if (op == "*") +in { +} +body { +} diff --git a/tests/knr/issue0210.d.ref b/tests/knr/issue0210.d.ref new file mode 100644 index 0000000..afef07a --- /dev/null +++ b/tests/knr/issue0210.d.ref @@ -0,0 +1,2 @@ +static assert(call(x) !is y); +static assert(call(x) is y); diff --git a/tests/knr/issue0212.d.ref b/tests/knr/issue0212.d.ref new file mode 100644 index 0000000..3f2df8e --- /dev/null +++ b/tests/knr/issue0212.d.ref @@ -0,0 +1,3 @@ +enum { + x = 3 +} diff --git a/tests/knr/issue0213.d.ref b/tests/knr/issue0213.d.ref new file mode 100644 index 0000000..b32eda7 --- /dev/null +++ b/tests/knr/issue0213.d.ref @@ -0,0 +1,6 @@ +version (linux) + import core.sys.linux.elf; +else version (FreeBSD) + import core.sys.freebsd.sys.elf; +else version (Solaris) + import core.sys.solaris.elf; diff --git a/tests/knr/issue0215a.d.ref b/tests/knr/issue0215a.d.ref new file mode 100644 index 0000000..96e2d7e --- /dev/null +++ b/tests/knr/issue0215a.d.ref @@ -0,0 +1,17 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0215b.d.ref b/tests/knr/issue0215b.d.ref new file mode 100644 index 0000000..59ff341 --- /dev/null +++ b/tests/knr/issue0215b.d.ref @@ -0,0 +1,17 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0215c.d.ref b/tests/knr/issue0215c.d.ref new file mode 100644 index 0000000..9a00fa1 --- /dev/null +++ b/tests/knr/issue0215c.d.ref @@ -0,0 +1,18 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) +if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0215d.d.ref b/tests/knr/issue0215d.d.ref new file mode 100644 index 0000000..2d52919 --- /dev/null +++ b/tests/knr/issue0215d.d.ref @@ -0,0 +1,18 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) + if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0216.d.ref b/tests/knr/issue0216.d.ref new file mode 100644 index 0000000..20d86fb --- /dev/null +++ b/tests/knr/issue0216.d.ref @@ -0,0 +1,5 @@ +unittest { + if (something || somethingElse || // I like putting comments here for no good reason + thirdThing) { + } +} diff --git a/tests/knr/issue0219.d.ref b/tests/knr/issue0219.d.ref new file mode 100644 index 0000000..cfab244 --- /dev/null +++ b/tests/knr/issue0219.d.ref @@ -0,0 +1,5 @@ +@OneOf("group1") { + JSONValue[string] fred; + bool mertz; + bool ethel; +} diff --git a/tests/knr/issue0220.d.ref b/tests/knr/issue0220.d.ref new file mode 100644 index 0000000..568c640 --- /dev/null +++ b/tests/knr/issue0220.d.ref @@ -0,0 +1,67 @@ +static if (someCondition) + void doStuff() + { + } +else + void doStuff() + { + } + +static if (someCondition) + void doStuff() + { + } +else static if (otherCondition) + void doStuff() + { + } + +static if (someCondition) + void doStuff() + { + } +else static if (otherCondition) + void doStuff() + { + } +else + void doStuff() + { + } + +static if (condition) + int a; +else + int b; + +static if (condition) + int a; +else static if (otherCondition) + int c; +else + int b; + +void doStuff(); + +static if (stuff) + int a; +else + class C { + public: + void aFunction(); + private: + int a; + int b; + } + +static if (condition) + int a; +else + int b; + +static if (condition) + int a; +else static if (otherCondition) + int c; +else + int b; diff --git a/tests/knr/issue0221.d.ref b/tests/knr/issue0221.d.ref new file mode 100644 index 0000000..a036bb7 --- /dev/null +++ b/tests/knr/issue0221.d.ref @@ -0,0 +1,4 @@ +unittest { + static if (stuff) // comment + things(); +} diff --git a/tests/knr/issue0222.d.ref b/tests/knr/issue0222.d.ref new file mode 100644 index 0000000..09a8058 --- /dev/null +++ b/tests/knr/issue0222.d.ref @@ -0,0 +1,4 @@ +unittest { + return (complicated % expression) / //------------------- + (other * complicated + expression); +} diff --git a/tests/knr/issue0223.d.ref b/tests/knr/issue0223.d.ref new file mode 100644 index 0000000..fc6f351 --- /dev/null +++ b/tests/knr/issue0223.d.ref @@ -0,0 +1,6 @@ +unittest { + if (info > 0) + throw new ExceptionWithLongName(std.string.format( + "During the LU factorization, it was found that the " ~ "%sth diagonal value is exactly zero.", + info), file, line); +} diff --git a/tests/knr/issue0224.d.ref b/tests/knr/issue0224.d.ref new file mode 100644 index 0000000..c0e868a --- /dev/null +++ b/tests/knr/issue0224.d.ref @@ -0,0 +1,5 @@ +unittest { + int a, /// comment + b, /// comment + c; /// comment +} diff --git a/tests/knr/issue0225.d.ref b/tests/knr/issue0225.d.ref new file mode 100644 index 0000000..b9ee234 --- /dev/null +++ b/tests/knr/issue0225.d.ref @@ -0,0 +1,4 @@ +static if (condition) + int declaration; +else { +} diff --git a/tests/knr/issue0226.d.ref b/tests/knr/issue0226.d.ref new file mode 100644 index 0000000..3406742 --- /dev/null +++ b/tests/knr/issue0226.d.ref @@ -0,0 +1,14 @@ +unittest { + auto a = 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + + 1234567890 + 1234567890 + 1234567890; + auto a = 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 + - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 + - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 + - 1234567890 - 1234567890 - 1234567890; + auto a = 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 + * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 + * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 + * 1234567890 * 1234567890 * 1234567890; +} diff --git a/tests/knr/issue0229.d.ref b/tests/knr/issue0229.d.ref new file mode 100644 index 0000000..bf8a8dc --- /dev/null +++ b/tests/knr/issue0229.d.ref @@ -0,0 +1,23 @@ +enum { + SQL_CA2_READ_ONLY_CONCURRENCY = 0x00000001L, + SQL_CA2_LOCK_CONCURRENCY = 0x00000002L, + SQL_CA2_OPT_ROWVER_CONCURRENCY = 0x00000004L, + SQL_CA2_OPT_VALUES_CONCURRENCY = 0x00000008L, + SQL_CA2_SENSITIVITY_ADDITIONS = 0x00000010L, + SQL_CA2_SENSITIVITY_DELETIONS = 0x00000020L, + SQL_CA2_SENSITIVITY_UPDATES = 0x00000040L, + // * semantics of SQL_ATTR_MAX_ROWS * + SQL_CA2_MAX_ROWS_SELECT = 0x00000080L, + SQL_CA2_MAX_ROWS_INSERT = 0x00000100L, + SQL_CA2_MAX_ROWS_DELETE = 0x00000200L, + SQL_CA2_MAX_ROWS_UPDATE = 0x00000400L, + SQL_CA2_MAX_ROWS_CATALOG = 0x00000800L, + SQL_CA2_MAX_ROWS_AFFECTS_ALL = ( + SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE + | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG), + SQL_CA2_CRC_EXACT = 0x00001000L, + SQL_CA2_CRC_APPROXIMATE = 0x00002000L, + SQL_CA2_SIMULATE_NON_UNIQUE = 0x00004000L, + SQL_CA2_SIMULATE_TRY_UNIQUE = 0x00008000L, + SQL_CA2_SIMULATE_UNIQUE = 0x00010000L +} diff --git a/tests/knr/issue0237.d.ref b/tests/knr/issue0237.d.ref new file mode 100644 index 0000000..3d5f77d --- /dev/null +++ b/tests/knr/issue0237.d.ref @@ -0,0 +1,39 @@ +void fn() +{ + { + { + { + auto file = { + "integrationtest/feed/etc/config.iniaasdfaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "etc/config.ini" + }; + { + int x; + } + } + } + } +} + +struct A { + int x, y, z; +} + +int main() +{ + int fun() + { + import std.stdio : writeln; + import std.typecons : tuple; + + A a = { + tuple(Variant(1))[0].get!int, tuple(Variant(2))[0].get!int, + tuple(Variant(3))[0].get!int + }; + A b = { + tuple(Variant(1))[0].get!int, tuple(Variant(2))[0].get!int, + tuple(Variant(3))[0].get!int + }; + writeln(a); + } +} diff --git a/tests/knr/issue0241.d.ref b/tests/knr/issue0241.d.ref new file mode 100644 index 0000000..d7576cb --- /dev/null +++ b/tests/knr/issue0241.d.ref @@ -0,0 +1,3 @@ +void round() +body { +} diff --git a/tests/knr/issue0244.d.ref b/tests/knr/issue0244.d.ref new file mode 100644 index 0000000..cbb172d --- /dev/null +++ b/tests/knr/issue0244.d.ref @@ -0,0 +1,4 @@ +enum Status : bool { + abort = true, + ignore = false +} diff --git a/tests/knr/issue0246.d.ref b/tests/knr/issue0246.d.ref new file mode 100644 index 0000000..3637e2f --- /dev/null +++ b/tests/knr/issue0246.d.ref @@ -0,0 +1,17 @@ +unittest { + with (Object) { + // do something + } + with (Object) with (Object) { + // do something + } + with (Object) with (Object) with (Object) { + // do something + } + + with (Object) { + with (Object) { + // do something + } + } +} diff --git a/tests/knr/issue0248.d.ref b/tests/knr/issue0248.d.ref new file mode 100644 index 0000000..457d138 --- /dev/null +++ b/tests/knr/issue0248.d.ref @@ -0,0 +1,11 @@ +T[] arrayOp(T, Args...)(T res, Filter!(isType, Args) args) @trusted @nogc pure @things + if (Args[$ - 1] != "=") +{ + +} + +T[] arrayOp(T, Args...)(T res, Filter!(isType, Args) args) @trusted @nogc pure nothrow + if (Args[$ - 1] != "=") +{ + +} diff --git a/tests/knr/issue0251.d.ref b/tests/knr/issue0251.d.ref new file mode 100644 index 0000000..92cca93 --- /dev/null +++ b/tests/knr/issue0251.d.ref @@ -0,0 +1,8 @@ +void stuff() +{ + asm { + int 80; + int 0b10; + int 0x80; + } +} diff --git a/tests/knr/issue0256.d.ref b/tests/knr/issue0256.d.ref new file mode 100644 index 0000000..5776aec --- /dev/null +++ b/tests/knr/issue0256.d.ref @@ -0,0 +1,11 @@ +void main() +{ + S s1 = {a: 3}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + T t = { + someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar + someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, + somethingMore: null, someFlagInThisStruct: -1 + }; +} diff --git a/tests/knr/issue0267.d.ref b/tests/knr/issue0267.d.ref new file mode 100644 index 0000000..24784cf --- /dev/null +++ b/tests/knr/issue0267.d.ref @@ -0,0 +1,19 @@ +void main() +{ + debug foo(); + else bar(); + + debug (0) + foo(); + else + bar(); + + // inlineElse reset check + + debug foo(); + + if (true) + foo(); + else + bar(); +} diff --git a/tests/knr/issue0273.d.ref b/tests/knr/issue0273.d.ref new file mode 100644 index 0000000..23afad9 --- /dev/null +++ b/tests/knr/issue0273.d.ref @@ -0,0 +1,4 @@ +void main() +{ + writeln("Expected " ~ descStr(type, data) ~ " but got " ~ this.descStr); +} diff --git a/tests/knr/issue0286.d.ref b/tests/knr/issue0286.d.ref new file mode 100644 index 0000000..b5b6ec2 --- /dev/null +++ b/tests/knr/issue0286.d.ref @@ -0,0 +1,14 @@ +void foo() +{ + if (true) + enum vectorizeable = aLongExpressionThatCausesWrapping() + && aLongExpressionThatCausesWrapping(); + else + enum vectorizeable = false; + + if (true) { + enum vectorizeable = aLongExpressionThatCausesWrapping() + && aLongExpressionThatCausesWrapping(); + } else + enum vectorizeable = false; +} diff --git a/tests/knr/issue0287.d.ref b/tests/knr/issue0287.d.ref new file mode 100644 index 0000000..9966542 --- /dev/null +++ b/tests/knr/issue0287.d.ref @@ -0,0 +1,3 @@ +alias foo = typeof({ import std.math; }); +alias bar = typeof({ write("aaa"); }); +alias baz = typeof({}); diff --git a/tests/knr/issue0303.d.ref b/tests/knr/issue0303.d.ref new file mode 100644 index 0000000..4f11f69 --- /dev/null +++ b/tests/knr/issue0303.d.ref @@ -0,0 +1,10 @@ +static foreach (thing; things) { + pragma(msg, thing); +} +static foreach_reverse (thing; things) { + pragma(msg, thing); +} +static foreach (thing; things) + pragma(msg, thing); +static foreach_reverse (thing; things) + pragma(msg, thing); diff --git a/tests/knr/issue0313.d.ref b/tests/knr/issue0313.d.ref new file mode 100644 index 0000000..bd3a545 --- /dev/null +++ b/tests/knr/issue0313.d.ref @@ -0,0 +1,13 @@ +void main() +{ + foreach (v; a) + try { + foo(); + } catch (Exception e) { + bar(); + } catch (Exception e) { + bar(); + } finally { + } + stuff(); +} diff --git a/tests/knr/issue0314.d.ref b/tests/knr/issue0314.d.ref new file mode 100644 index 0000000..c7e3541 --- /dev/null +++ b/tests/knr/issue0314.d.ref @@ -0,0 +1,10 @@ +void main() +{ + auto d = { + if (a) + foreach (b; c) { + } + else + e(); + }; +} diff --git a/tests/knr/issue0321.d.ref b/tests/knr/issue0321.d.ref new file mode 100644 index 0000000..7f891fd --- /dev/null +++ b/tests/knr/issue0321.d.ref @@ -0,0 +1,7 @@ +void test() +{ + #line 100 + int a; + #line 200 "anotherfile" + int b; +} diff --git a/tests/knr/issue0326.d.ref b/tests/knr/issue0326.d.ref new file mode 100644 index 0000000..0a51d21 --- /dev/null +++ b/tests/knr/issue0326.d.ref @@ -0,0 +1,4 @@ +void main() +{ + () @trusted { stderr.writeln("\033[01;33m", url, "\033[0m"); }(); +} diff --git a/tests/knr/issue0345.d.ref b/tests/knr/issue0345.d.ref new file mode 100644 index 0000000..5253831 --- /dev/null +++ b/tests/knr/issue0345.d.ref @@ -0,0 +1,3 @@ +class Bar(A) : Foo +if (isFloating!A) { +} diff --git a/tests/knr/issue0349.d.ref b/tests/knr/issue0349.d.ref new file mode 100644 index 0000000..c64f3e8 --- /dev/null +++ b/tests/knr/issue0349.d.ref @@ -0,0 +1,6 @@ +import super_long_import_module_name : withSuperLongSymbolNames, andAlsoLotsOfThem; +import super_long_import_module_name : withSuperLongSymbolNames, + andAlsoLotsOfThem, lotsAnsLots, andLots, andLotsOfThem, lineExceeds120; + +private: +void foo(); diff --git a/tests/knr/issue0361.d.ref b/tests/knr/issue0361.d.ref new file mode 100644 index 0000000..7e2b562 --- /dev/null +++ b/tests/knr/issue0361.d.ref @@ -0,0 +1,11 @@ +void foo() /**/ +in { +} +body { +} + +void bar() /**/ +out { +} +body { +} diff --git a/tests/knr/issue0372.d.ref b/tests/knr/issue0372.d.ref new file mode 100644 index 0000000..e47a83c --- /dev/null +++ b/tests/knr/issue0372.d.ref @@ -0,0 +1,22 @@ +void main(string[] args) +{ + // Test with catch + if (args.length > 1) + try + doSomeStuff(); + catch (Exception error) + ohNoSomeErrorHappened(); + else + thatsNotHowYouUseThisProgram(); + + // Test with finally + if (args.length > 2) + try + doOtherStuff(); + catch (Exception error) + ohNoSomeErrorHappened(); + finally + doSomeCleanup(); + else + dontDoOtherStuff(); +} diff --git a/tests/knr/issue0384.d.ref b/tests/knr/issue0384.d.ref new file mode 100644 index 0000000..cccd08b --- /dev/null +++ b/tests/knr/issue0384.d.ref @@ -0,0 +1,30 @@ +import std.stdio : readln, /* comment1 */ writeln; +import std.stdio : readln, // comment2 + writeln; +import std.stdio : readln, + // comment3 + writeln; +import std.stdio : readln, + /* comment4 */ + writeln; +import std.stdio : readln, readln, readln, readln, readln, readln, readln, + readln, readln, readln, readln, + // comment5 + writeln; +import std.stdio : // comment6 + readln, readln, readln, readln, readln, readln, // comment7 + // comment8 + writeln; +import std.stdio : /* comment9 */ + readln, readln, readln, readln, readln, readln, /* comment10 */ + // comment11 + writeln; +import std.stdio : readln, // comment12 + readln, readln, readln, readln, readln, readln, // comment13 + // comment14 + writeln; +import std.stdio : readln, + // comment15 + readln, readln, readln, readln, readln, readln, // comment16 + // comment17 + writeln; diff --git a/tests/knr/issue0426.d.ref b/tests/knr/issue0426.d.ref new file mode 100644 index 0000000..72d3d26 --- /dev/null +++ b/tests/knr/issue0426.d.ref @@ -0,0 +1,6 @@ +import std.stdio; + +@safe extern (C) void main() +{ + writeln("Hello World!"); +} diff --git a/tests/knr/issue0430.d.ref b/tests/knr/issue0430.d.ref new file mode 100644 index 0000000..1dd228b --- /dev/null +++ b/tests/knr/issue0430.d.ref @@ -0,0 +1,5 @@ +void f(bool body) +{ + if (body) { + } +} diff --git a/tests/knr/issue0433.d.ref b/tests/knr/issue0433.d.ref new file mode 100644 index 0000000..bde6071 --- /dev/null +++ b/tests/knr/issue0433.d.ref @@ -0,0 +1,7 @@ +int abs(int x) +{ + if (x < 0) // x negative, must negate + return -x; + else // x already non-negative, just return it + return x; +} diff --git a/tests/knr/issue0436.d.ref b/tests/knr/issue0436.d.ref new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/knr/issue0436.d.ref @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/knr/issue0448.d.ref b/tests/knr/issue0448.d.ref new file mode 100644 index 0000000..d3392c2 --- /dev/null +++ b/tests/knr/issue0448.d.ref @@ -0,0 +1,3 @@ +struct S { + invariant (true); +} diff --git a/tests/knr/issue0451.d.ref b/tests/knr/issue0451.d.ref new file mode 100644 index 0000000..fbd790f --- /dev/null +++ b/tests/knr/issue0451.d.ref @@ -0,0 +1,37 @@ +class C { + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do { + } + + abstract void f6() /* */ + do { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ + { + return true; + } +} diff --git a/tests/knr/issue0452.d.ref b/tests/knr/issue0452.d.ref new file mode 100644 index 0000000..e4aed14 --- /dev/null +++ b/tests/knr/issue0452.d.ref @@ -0,0 +1,2 @@ +@nogc // +void foo(); diff --git a/tests/knr/issue0454.d.ref b/tests/knr/issue0454.d.ref new file mode 100644 index 0000000..27b0ef1 --- /dev/null +++ b/tests/knr/issue0454.d.ref @@ -0,0 +1,10 @@ +void main() +{ + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, + argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/knr/issue0465.d.ref b/tests/knr/issue0465.d.ref new file mode 100644 index 0000000..b28f284 --- /dev/null +++ b/tests/knr/issue0465.d.ref @@ -0,0 +1,8 @@ +bool asdf(const string owner, const string mail) @safe +{ + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/knr/issue0476.d.ref b/tests/knr/issue0476.d.ref new file mode 100644 index 0000000..c95e2de --- /dev/null +++ b/tests/knr/issue0476.d.ref @@ -0,0 +1,7 @@ +string BuildForwardCall() +{ + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/knr/issue0483.d.ref b/tests/knr/issue0483.d.ref new file mode 100644 index 0000000..7e3f860 --- /dev/null +++ b/tests/knr/issue0483.d.ref @@ -0,0 +1,14 @@ +module tests.issue0483; + +void main() +{ + switch (0) { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/knr/issue0485.d.ref b/tests/knr/issue0485.d.ref new file mode 100644 index 0000000..037932e --- /dev/null +++ b/tests/knr/issue0485.d.ref @@ -0,0 +1,5 @@ +void main() +{ + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/knr/issue0486.d.ref b/tests/knr/issue0486.d.ref new file mode 100644 index 0000000..de7a540 --- /dev/null +++ b/tests/knr/issue0486.d.ref @@ -0,0 +1,5 @@ +void main() +{ + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/knr/issue0497.d.ref b/tests/knr/issue0497.d.ref new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/knr/issue0497.d.ref @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/knr/issue0501.d.ref b/tests/knr/issue0501.d.ref new file mode 100644 index 0000000..8f1cf11 --- /dev/null +++ b/tests/knr/issue0501.d.ref @@ -0,0 +1,4 @@ +void main() +{ + auto aa = ["aaa": 1, "bbb": 2]; +} diff --git a/tests/knr/issue0504.d.ref b/tests/knr/issue0504.d.ref new file mode 100644 index 0000000..7fb4598 --- /dev/null +++ b/tests/knr/issue0504.d.ref @@ -0,0 +1,40 @@ +deprecated("foo") +void test() +{ +} + +package(foo) +void bar() +{ +} + +@uda() +void baz() +{ +} + +deprecated +deprecated_() +{ +} + +@uda +void uda_() +{ +} + +@property +void property() +{ +} + +deprecated("Reason") @uda +void propertyuda() +{ +} + +deprecated("Reason") +@uda +void udaproperty() +{ +} diff --git a/tests/knr/issue0508.d.ref b/tests/knr/issue0508.d.ref new file mode 100644 index 0000000..acd5850 --- /dev/null +++ b/tests/knr/issue0508.d.ref @@ -0,0 +1,5 @@ +struct S { + @safe invariant { + assert(true); + } +} diff --git a/tests/knr/issue0509.d.ref b/tests/knr/issue0509.d.ref new file mode 100644 index 0000000..52b1c7c --- /dev/null +++ b/tests/knr/issue0509.d.ref @@ -0,0 +1,34 @@ +void main() +{ + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf // blah + .flub; +} + +void main() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/knr/issue0515.d.ref b/tests/knr/issue0515.d.ref new file mode 100644 index 0000000..21d91a4 --- /dev/null +++ b/tests/knr/issue0515.d.ref @@ -0,0 +1,6 @@ +struct S { + ref S foo() return + { + return this; + } +} diff --git a/tests/knr/issue0521.d.ref b/tests/knr/issue0521.d.ref new file mode 100644 index 0000000..1bf0602 --- /dev/null +++ b/tests/knr/issue0521.d.ref @@ -0,0 +1,16 @@ +public int f() return +in (true) +{ + return 0; +} + +public int g() return +out (; true) +{ + return 0; +} + +public int h() return +body { + return 0; +} diff --git a/tests/knr/issue0528.d.ref b/tests/knr/issue0528.d.ref new file mode 100644 index 0000000..304b696 --- /dev/null +++ b/tests/knr/issue0528.d.ref @@ -0,0 +1,3 @@ +void f() return +do { +} diff --git a/tests/knr/keep_break_in_array_arg.d.ref b/tests/knr/keep_break_in_array_arg.d.ref new file mode 100644 index 0000000..5f56bb7 --- /dev/null +++ b/tests/knr/keep_break_in_array_arg.d.ref @@ -0,0 +1,5 @@ +unittest { + f([ + x + ]); +} diff --git a/tests/knr/keep_break_in_array_chain.d.ref b/tests/knr/keep_break_in_array_chain.d.ref new file mode 100644 index 0000000..b8cf577 --- /dev/null +++ b/tests/knr/keep_break_in_array_chain.d.ref @@ -0,0 +1,6 @@ +unittest { + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/knr/keep_line_breaks.d.ref b/tests/knr/keep_line_breaks.d.ref new file mode 100644 index 0000000..977d797 --- /dev/null +++ b/tests/knr/keep_line_breaks.d.ref @@ -0,0 +1,35 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) +{ + if (true && true + && true && true + && true && true) { + } else if (true && true && + true && true && + true && true) { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + + ` + + + `.format!"%s"; + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/knr/keep_single_indent.d.ref b/tests/knr/keep_single_indent.d.ref new file mode 100644 index 0000000..5faf64a --- /dev/null +++ b/tests/knr/keep_single_indent.d.ref @@ -0,0 +1,44 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +void f() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/knr/lambda_param_attrib.d.ref b/tests/knr/lambda_param_attrib.d.ref new file mode 100644 index 0000000..a1feb0b --- /dev/null +++ b/tests/knr/lambda_param_attrib.d.ref @@ -0,0 +1 @@ +alias fun = (@(0) @(1) int p) => ((@Foo p) { return 0; })(p); diff --git a/tests/knr/longParamList.d.ref b/tests/knr/longParamList.d.ref new file mode 100644 index 0000000..76a508a --- /dev/null +++ b/tests/knr/longParamList.d.ref @@ -0,0 +1,17 @@ +version (AArch64) { + class SomeLongClassName { + public: + + double javaStyleFunctionName(double alpha, double bravo, double charlie, + double delta, double echo, double foxtrot, double golf, double hotel) + { + if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta) { + if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta) { + if (alpha < beta && alpha > golf && hotel < alpha + && bravo >= charlie && echo < delta) { + } + } + } + } + } +} diff --git a/tests/knr/minimizeLength.d.ref b/tests/knr/minimizeLength.d.ref new file mode 100644 index 0000000..efd8252 --- /dev/null +++ b/tests/knr/minimizeLength.d.ref @@ -0,0 +1,19 @@ +unittest { + validMoves!(typeof(open))(open, tokens[0 .. tokensEnd], depths[0 .. tokensEnd], + current.breaks, config, currentLineLength, indentLevel); +} + +/+ +// good +unittest +{ + validMoves!(typeof(open))(open, tokens[0 .. tokensEnd], depths[0 .. tokensEnd], + current.breaks, config, currentLineLength, indentLevel); +} +// bad +unittest +{ + validMoves!(typeof(open))(open, tokens[0 .. tokensEnd], + depths[0 .. tokensEnd], current.breaks, config, currentLineLength, indentLevel); +} ++/ diff --git a/tests/knr/multiline_string.d.ref b/tests/knr/multiline_string.d.ref new file mode 100644 index 0000000..1aba27c --- /dev/null +++ b/tests/knr/multiline_string.d.ref @@ -0,0 +1,11 @@ +unittest { + someFunctionCall(` + multi-line string + multi-line string + multi-line string + multi-line string + multi-line string + multi-line string + multi-line string + `, paramater); +} diff --git a/tests/knr/parenIndent.d.ref b/tests/knr/parenIndent.d.ref new file mode 100644 index 0000000..053585f --- /dev/null +++ b/tests/knr/parenIndent.d.ref @@ -0,0 +1,31 @@ +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) { + a(); + } + } + + if (parenDepth == 0 && (peekIs(tok!"is") || peekIs(tok!"in") + || peekIs(tok!"out") || peekIs(tok!"body"))) + writeToken(); + + { + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" + && indents.top != tok!"version") || !peekIs(tok!"else"))) { + indents.pop(); + } + } + } + + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) { + indents.pop(); + } + } +} diff --git a/tests/knr/propertySpacing.d.ref b/tests/knr/propertySpacing.d.ref new file mode 100644 index 0000000..0dc8bcb --- /dev/null +++ b/tests/knr/propertySpacing.d.ref @@ -0,0 +1 @@ +@property double y(); diff --git a/tests/knr/single_indent.d.ref b/tests/knr/single_indent.d.ref new file mode 100644 index 0000000..47e34b5 --- /dev/null +++ b/tests/knr/single_indent.d.ref @@ -0,0 +1,36 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/knr/swap.d.ref b/tests/knr/swap.d.ref new file mode 100644 index 0000000..660e05a --- /dev/null +++ b/tests/knr/swap.d.ref @@ -0,0 +1,26 @@ +import std.algorithm : swap; // from Phobos standard library + +// The D solution uses templates and it's similar to the C++ one: +void mySwap(T)(ref T left, ref T right) +{ + auto temp = left; + left = right; + right = temp; +} + +void main() +{ + import std.stdio; + + int[] a = [10, 20]; + writeln(a); + + // The std.algorithm standard library module + // contains a generic swap: + swap(a[0], a[1]); + writeln(a); + + // Using mySwap: + mySwap(a[0], a[1]); + writeln(a); +} diff --git a/tests/knr/ufcschain.d.ref b/tests/knr/ufcschain.d.ref new file mode 100644 index 0000000..c36b1ae --- /dev/null +++ b/tests/knr/ufcschain.d.ref @@ -0,0 +1,6 @@ +void main() +{ + stuff[].map!(things => stuff.doThings) + .filter!(stuff) + .array(); +} diff --git a/tests/knr/wrapping1.d.ref b/tests/knr/wrapping1.d.ref new file mode 100644 index 0000000..b757ff8 --- /dev/null +++ b/tests/knr/wrapping1.d.ref @@ -0,0 +1,7 @@ +void main(string[] args) +{ + if (prevLocation != size_t.max) { + addErrorMessage(line, column, KEY, "Expression %s is true: already checked on line %d.".format( + expressions[prevLocation].formatted, expressions[prevLocation].line)); + } +} diff --git a/tests/otbs/2d_arrays.d.ref b/tests/otbs/2d_arrays.d.ref new file mode 100644 index 0000000..5b685ec --- /dev/null +++ b/tests/otbs/2d_arrays.d.ref @@ -0,0 +1,37 @@ +unittest { + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/otbs/array_access.d.ref b/tests/otbs/array_access.d.ref new file mode 100644 index 0000000..cf66c3d --- /dev/null +++ b/tests/otbs/array_access.d.ref @@ -0,0 +1,6 @@ +unittest { + foo([ + target.value.region[1], target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1] + ]); +} diff --git a/tests/otbs/assoc_key_indent.d.ref b/tests/otbs/assoc_key_indent.d.ref new file mode 100644 index 0000000..814c7cd --- /dev/null +++ b/tests/otbs/assoc_key_indent.d.ref @@ -0,0 +1,7 @@ +void main() { + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/otbs/associative_array.d.ref b/tests/otbs/associative_array.d.ref new file mode 100644 index 0000000..48442a3 --- /dev/null +++ b/tests/otbs/associative_array.d.ref @@ -0,0 +1,25 @@ +unittest { + Bson base = Bson([ + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]; +} diff --git a/tests/otbs/associative_array_complex.d.ref b/tests/otbs/associative_array_complex.d.ref new file mode 100644 index 0000000..c3c9d00 --- /dev/null +++ b/tests/otbs/associative_array_complex.d.ref @@ -0,0 +1,24 @@ +auto find() { + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/otbs/dip1009.d.ref b/tests/otbs/dip1009.d.ref index e65b139..ef6b9c8 100644 --- a/tests/otbs/dip1009.d.ref +++ b/tests/otbs/dip1009.d.ref @@ -10,8 +10,8 @@ do { } int bar(int arg) -in(arg > 0) -out(; true) +in (arg > 0) +out (; true) out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) { return 0; } diff --git a/tests/otbs/issue0017.d.ref b/tests/otbs/issue0017.d.ref index 8a32cec..541c22a 100644 --- a/tests/otbs/issue0017.d.ref +++ b/tests/otbs/issue0017.d.ref @@ -1,3 +1,4 @@ -immutable NameId[] namesA = [{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS -{"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS +immutable NameId[] namesA = [ + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/otbs/issue0023.d.ref b/tests/otbs/issue0023.d.ref index d9488ea..c724640 100644 --- a/tests/otbs/issue0023.d.ref +++ b/tests/otbs/issue0023.d.ref @@ -8,25 +8,28 @@ string generateFixedLengthCases() { string[] fixedLengthTokens = [ "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", - "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", "char", "class", - "const", "continue", "creal", "dchar", "debug", "default", "delegate", "delete", "deprecated", - "do", "double", "else", "enum", "export", "extern", "false", "final", "finally", "float", - "for", "foreach", "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", "immutable", - "import", "in", "inout", "int", "interface", "invariant", "ireal", "is", - "lazy", "long", "macro", "mixin", "module", "new", "nothrow", "null", "out", "override", - "package", "pragma", "private", "protected", "public", "pure", "real", "ref", "return", "scope", - "shared", "short", "static", "struct", "super", "switch", "synchronized", "template", "this", - "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", - "union", "unittest", "ushort", "version", "void", "volatile", "wchar", - "while", "with", "__DATE__", "__EOF__", "__FILE__", - "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters", - "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", - "__traits", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", - "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", - "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", - "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", - "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~=" + "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", + "char", "class", "const", "continue", "creal", "dchar", "debug", "default", + "delegate", "delete", "deprecated", "do", "double", "else", "enum", + "export", "extern", "false", "final", "finally", "float", "for", "foreach", + "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", + "immutable", "import", "in", "inout", "int", "interface", "invariant", + "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", + "nothrow", "null", "out", "override", "package", "pragma", "private", + "protected", "public", "pure", "real", "ref", "return", "scope", "shared", + "short", "static", "struct", "super", "switch", "synchronized", "template", + "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", + "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void", + "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", + "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", + "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", + "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VERSION__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" ]; } diff --git a/tests/otbs/issue0112_variation.d.ref b/tests/otbs/issue0112_variation.d.ref new file mode 100644 index 0000000..424c1dd --- /dev/null +++ b/tests/otbs/issue0112_variation.d.ref @@ -0,0 +1,13 @@ +unittest { + testScene = new Scene(longArgument, longArgument, longArgument, + longArgument, longArgument, longArgument, delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/otbs/issue0119.d.ref b/tests/otbs/issue0119.d.ref index 7ca23f6..9f0d8d1 100644 --- a/tests/otbs/issue0119.d.ref +++ b/tests/otbs/issue0119.d.ref @@ -1,5 +1,5 @@ -auto fun = function() { }; -auto fun = () { }; +auto fun = function() {}; +auto fun = () {}; auto fun = {}; auto fun = { int i; }; diff --git a/tests/otbs/issue0134.d.ref b/tests/otbs/issue0134.d.ref new file mode 100644 index 0000000..4e2c535 --- /dev/null +++ b/tests/otbs/issue0134.d.ref @@ -0,0 +1,13 @@ +void foo() { + string command; + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + unittest { + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/otbs/issue0195.d.ref b/tests/otbs/issue0195.d.ref new file mode 100644 index 0000000..85955a0 --- /dev/null +++ b/tests/otbs/issue0195.d.ref @@ -0,0 +1,14 @@ +void main() { + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; l) { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/otbs/issue0256.d.ref b/tests/otbs/issue0256.d.ref new file mode 100644 index 0000000..ca215a4 --- /dev/null +++ b/tests/otbs/issue0256.d.ref @@ -0,0 +1,10 @@ +void main() { + S s1 = {a: 3}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + T t = { + someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar + someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, + somethingMore: null, someFlagInThisStruct: -1 + }; +} diff --git a/tests/otbs/issue0287.d.ref b/tests/otbs/issue0287.d.ref index 461addf..9966542 100644 --- a/tests/otbs/issue0287.d.ref +++ b/tests/otbs/issue0287.d.ref @@ -1,3 +1,3 @@ alias foo = typeof({ import std.math; }); alias bar = typeof({ write("aaa"); }); -alias baz = typeof({ }); +alias baz = typeof({}); diff --git a/tests/otbs/issue0361.d.ref b/tests/otbs/issue0361.d.ref new file mode 100644 index 0000000..7e2b562 --- /dev/null +++ b/tests/otbs/issue0361.d.ref @@ -0,0 +1,11 @@ +void foo() /**/ +in { +} +body { +} + +void bar() /**/ +out { +} +body { +} diff --git a/tests/otbs/issue0426.d.ref b/tests/otbs/issue0426.d.ref new file mode 100644 index 0000000..b43e99a --- /dev/null +++ b/tests/otbs/issue0426.d.ref @@ -0,0 +1,5 @@ +import std.stdio; + +@safe extern (C) void main() { + writeln("Hello World!"); +} diff --git a/tests/otbs/issue0430.d.ref b/tests/otbs/issue0430.d.ref new file mode 100644 index 0000000..ce11f55 --- /dev/null +++ b/tests/otbs/issue0430.d.ref @@ -0,0 +1,4 @@ +void f(bool body) { + if (body) { + } +} diff --git a/tests/otbs/issue0433.d.ref b/tests/otbs/issue0433.d.ref new file mode 100644 index 0000000..e0613d8 --- /dev/null +++ b/tests/otbs/issue0433.d.ref @@ -0,0 +1,6 @@ +int abs(int x) { + if (x < 0) // x negative, must negate + return -x; + else // x already non-negative, just return it + return x; +} diff --git a/tests/otbs/issue0436.d.ref b/tests/otbs/issue0436.d.ref new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/otbs/issue0436.d.ref @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/otbs/issue0448.d.ref b/tests/otbs/issue0448.d.ref new file mode 100644 index 0000000..d3392c2 --- /dev/null +++ b/tests/otbs/issue0448.d.ref @@ -0,0 +1,3 @@ +struct S { + invariant (true); +} diff --git a/tests/otbs/issue0451.d.ref b/tests/otbs/issue0451.d.ref new file mode 100644 index 0000000..fed04e5 --- /dev/null +++ b/tests/otbs/issue0451.d.ref @@ -0,0 +1,36 @@ +class C { + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do { + } + + abstract void f6() /* */ + do { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ { + return true; + } +} diff --git a/tests/otbs/issue0452.d.ref b/tests/otbs/issue0452.d.ref new file mode 100644 index 0000000..e4aed14 --- /dev/null +++ b/tests/otbs/issue0452.d.ref @@ -0,0 +1,2 @@ +@nogc // +void foo(); diff --git a/tests/otbs/issue0454.d.ref b/tests/otbs/issue0454.d.ref new file mode 100644 index 0000000..d1c12ed --- /dev/null +++ b/tests/otbs/issue0454.d.ref @@ -0,0 +1,9 @@ +void main() { + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, + argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/otbs/issue0465.d.ref b/tests/otbs/issue0465.d.ref new file mode 100644 index 0000000..e20c47f --- /dev/null +++ b/tests/otbs/issue0465.d.ref @@ -0,0 +1,7 @@ +bool asdf(const string owner, const string mail) @safe { + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/otbs/issue0476.d.ref b/tests/otbs/issue0476.d.ref new file mode 100644 index 0000000..924e771 --- /dev/null +++ b/tests/otbs/issue0476.d.ref @@ -0,0 +1,6 @@ +string BuildForwardCall() { + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/otbs/issue0483.d.ref b/tests/otbs/issue0483.d.ref new file mode 100644 index 0000000..b23c692 --- /dev/null +++ b/tests/otbs/issue0483.d.ref @@ -0,0 +1,13 @@ +module tests.issue0483; + +void main() { + switch (0) { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/otbs/issue0485.d.ref b/tests/otbs/issue0485.d.ref new file mode 100644 index 0000000..058d065 --- /dev/null +++ b/tests/otbs/issue0485.d.ref @@ -0,0 +1,4 @@ +void main() { + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/otbs/issue0486.d.ref b/tests/otbs/issue0486.d.ref new file mode 100644 index 0000000..5f65301 --- /dev/null +++ b/tests/otbs/issue0486.d.ref @@ -0,0 +1,4 @@ +void main() { + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/otbs/issue0497.d.ref b/tests/otbs/issue0497.d.ref new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/otbs/issue0497.d.ref @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/otbs/issue0501.d.ref b/tests/otbs/issue0501.d.ref new file mode 100644 index 0000000..675401d --- /dev/null +++ b/tests/otbs/issue0501.d.ref @@ -0,0 +1,3 @@ +void main() { + auto aa = ["aaa": 1, "bbb": 2]; +} diff --git a/tests/otbs/issue0504.d.ref b/tests/otbs/issue0504.d.ref new file mode 100644 index 0000000..94a222c --- /dev/null +++ b/tests/otbs/issue0504.d.ref @@ -0,0 +1,32 @@ +deprecated("foo") +void test() { +} + +package(foo) +void bar() { +} + +@uda() +void baz() { +} + +deprecated +deprecated_() { +} + +@uda +void uda_() { +} + +@property +void property() { +} + +deprecated("Reason") @uda +void propertyuda() { +} + +deprecated("Reason") +@uda +void udaproperty() { +} diff --git a/tests/otbs/issue0508.d.ref b/tests/otbs/issue0508.d.ref new file mode 100644 index 0000000..acd5850 --- /dev/null +++ b/tests/otbs/issue0508.d.ref @@ -0,0 +1,5 @@ +struct S { + @safe invariant { + assert(true); + } +} diff --git a/tests/otbs/issue0509.d.ref b/tests/otbs/issue0509.d.ref new file mode 100644 index 0000000..62b06c2 --- /dev/null +++ b/tests/otbs/issue0509.d.ref @@ -0,0 +1,30 @@ +void main() { + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() { + afdsafds + .asdf // blah + .flub; +} + +void main() { + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() { + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/otbs/issue0515.d.ref b/tests/otbs/issue0515.d.ref new file mode 100644 index 0000000..05d4164 --- /dev/null +++ b/tests/otbs/issue0515.d.ref @@ -0,0 +1,5 @@ +struct S { + ref S foo() return { + return this; + } +} diff --git a/tests/otbs/issue0521.d.ref b/tests/otbs/issue0521.d.ref new file mode 100644 index 0000000..14f0645 --- /dev/null +++ b/tests/otbs/issue0521.d.ref @@ -0,0 +1,14 @@ +public int f() return +in (true) { + return 0; +} + +public int g() return +out (; true) { + return 0; +} + +public int h() return +body { + return 0; +} diff --git a/tests/otbs/issue0528.d.ref b/tests/otbs/issue0528.d.ref new file mode 100644 index 0000000..304b696 --- /dev/null +++ b/tests/otbs/issue0528.d.ref @@ -0,0 +1,3 @@ +void f() return +do { +} diff --git a/tests/otbs/keep_break_in_array_arg.d.ref b/tests/otbs/keep_break_in_array_arg.d.ref new file mode 100644 index 0000000..5f56bb7 --- /dev/null +++ b/tests/otbs/keep_break_in_array_arg.d.ref @@ -0,0 +1,5 @@ +unittest { + f([ + x + ]); +} diff --git a/tests/otbs/keep_break_in_array_chain.d.ref b/tests/otbs/keep_break_in_array_chain.d.ref new file mode 100644 index 0000000..b8cf577 --- /dev/null +++ b/tests/otbs/keep_break_in_array_chain.d.ref @@ -0,0 +1,6 @@ +unittest { + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/otbs/keep_line_breaks.d.ref b/tests/otbs/keep_line_breaks.d.ref new file mode 100644 index 0000000..cd6babe --- /dev/null +++ b/tests/otbs/keep_line_breaks.d.ref @@ -0,0 +1,34 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) { + if (true && true + && true && true + && true && true) { + } else if (true && true && + true && true && + true && true) { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + + ` + + + `.format!"%s"; + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/otbs/keep_single_indent.d.ref b/tests/otbs/keep_single_indent.d.ref new file mode 100644 index 0000000..933dcde --- /dev/null +++ b/tests/otbs/keep_single_indent.d.ref @@ -0,0 +1,42 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +void f() { + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/otbs/single_indent.d.ref b/tests/otbs/single_indent.d.ref new file mode 100644 index 0000000..b84d23e --- /dev/null +++ b/tests/otbs/single_indent.d.ref @@ -0,0 +1,35 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/single_indent.args b/tests/single_indent.args new file mode 100644 index 0000000..246c076 --- /dev/null +++ b/tests/single_indent.args @@ -0,0 +1 @@ +--single_indent true diff --git a/tests/single_indent.d b/tests/single_indent.d new file mode 100644 index 0000000..ffb2d50 --- /dev/null +++ b/tests/single_indent.d @@ -0,0 +1,42 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/test.sh b/tests/test.sh index 7f11c5a..da44e97 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash set -e -for braceStyle in allman otbs +for braceStyle in allman otbs knr do for source in *.d do echo "${source}.ref" "${braceStyle}/${source}.out" - argsFile=$(basename ${source} .d).args - if [ -e ${argsFile} ]; then - args=$(cat ${argsFile}) + argsFile=$(basename "${source}" .d).args + if [ -e "${argsFile}" ]; then + args=$(cat "${argsFile}") else args= fi @@ -16,3 +16,13 @@ do diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out" done done + +set +e + +for source in expected_failures/*.d +do + if ../bin/dfmt "${source}" > /dev/null; then + echo "Expected failure on test ${source} but passed" + exit 1 + fi +done