Commit Graph

50 Commits

Author SHA1 Message Date
Araq
ace3b341a3 nimpretty: fixes #11699
(cherry picked from commit 7deb49e992)
2019-07-19 16:47:36 +02:00
Araq
ce7a0e3ffb [refactoring] nimpretty
(cherry picked from commit 5b7273b4f8)
2019-07-19 16:47:28 +02:00
Araq
8eb66f6c6b nimpretty: implement a --maxLineLen command line option
(cherry picked from commit 5bf3734984)
2019-07-15 08:03:53 +02:00
Miran
622eadff52 nimpretty: fix #11700, no extra newlines (#11714)
(cherry picked from commit 2f0a50fa51)
2019-07-15 08:03:53 +02:00
Araq
e34a318b9f minor style changes
(cherry picked from commit cb3c3c306c)
2019-07-15 08:03:16 +02:00
narimiran
da2a149522 nimpretty: more comment indentation fixes
(cherry picked from commit 96d49608c0)
2019-07-15 07:58:26 +02:00
Araq
8afe92a1ab nimpretty: more improvements
(cherry picked from commit eefcea8892)
2019-07-15 07:58:26 +02:00
Araq
e0b4d034bc nimpretty: yet another improvement
(cherry picked from commit 0193c8ad2e)
2019-07-15 07:58:26 +02:00
Miran
585a08548a nimpretty: don't introduce extra spaces after a colon or a comma (#11672)
(cherry picked from commit d0616ed115)
2019-07-08 11:33:20 +02:00
Miran
a31b3ef3cf nimpretty: improved detection of commas and semicolons (#11661)
* nimpretty: improved detection of commas and semicolons

* address the comments

(cherry picked from commit 34c09a98c7)
2019-07-08 11:28:42 +02:00
Miran
5863461d47 nimpretty: don't touch formatted multiline comments (#11663)
(cherry picked from commit 176eaf5c90)
2019-07-08 11:28:42 +02:00
narimiran
88896194bd nimpretty: nicer debugging [ci skip]
(cherry picked from commit 2c0c0e772c)
2019-07-08 11:28:42 +02:00
Miran
5689003410 nimpretty: relax line length rules when dealing with (inline) comments (#11657)
(cherry picked from commit 96a19ea1b4)
2019-07-08 11:28:42 +02:00
narimiran
66660eca32 nimpretty: fix out of bounds error [ci skip]
(cherry picked from commit 4450fca6fd)
2019-07-08 11:27:15 +02:00
Araq
d13c75eb2f nimpretty: nimpretty now understands splitting newlines
(cherry picked from commit a59f0adc50)
2019-07-08 11:27:15 +02:00
Araq
f70a0c90f1 nimpretty: distinguish between the different kinds of newlines in Nim
(cherry picked from commit 7d29f8b1a4)
2019-07-08 11:27:15 +02:00
Miran
da3a7b852d [bugfix] fix wrong nimpretty unidents, refs #11616 (#11645)
(cherry picked from commit 0718d6c2cd)
2019-07-08 11:27:15 +02:00
Miran
466d5ba060 [bugfix] nimpretty indents multiline comments correctly (#11607)
(cherry picked from commit c522a455df)
2019-07-02 13:57:12 +02:00
Araq
970c7616bc nimpretty: bugfix [bugfix]
(cherry picked from commit 284a8cb58a)
2019-07-02 13:55:37 +02:00
Miran
38aa7f6d20 [bugfix] fix #11469, new rules for a newline in nimpretty (#11512)
* [bugfix] fix #11469, new rules for a newline in nimpretty
* concatenate two lines if they have the same indentation level

(cherry picked from commit f288e1b11a)
2019-06-27 20:59:46 +02:00
Araq
63116d94ae [bugfix] nimpretty: better alignment; fixes #11467
(cherry picked from commit 57a83df745)
2019-06-16 17:19:43 +02:00
Araq
21910d6eb1 [bugfix] nimpretty: fixes #11470
(cherry picked from commit 165ea46284)
2019-06-16 17:18:58 +02:00
Andreas Rumpf
caf93f4355 nimpretty: smart tabs support, fixes #9399 [bugfix] 2019-06-10 10:50:15 +02:00
Andreas Rumpf
cb47e49d3b nimpretty: keep a seq of tokens instead of a single string to enable better transformations [refactoring] 2019-06-09 22:22:50 +02:00
Andreas Rumpf
9f82e07b2d nimpretty: fixes #10156 [bugfix] 2019-06-08 00:00:00 +02:00
Araq
667af87e66 nimpretty: fixes #9505 [bugfix] 2019-06-07 12:59:31 +02:00
Araq
790bc5b07b nimpretty: fixes #10177 [bugfix] 2019-06-07 11:50:56 +02:00
Araq
447cc1ff09 nimpretty: fixes #10295 2019-06-07 10:37:00 +02:00
tofu
a990afcedc fixes #10200 (#10950)
* fixes #10200

* add rule for other comparison operators

* add rule for '!='

* add test

* fixed to pass the test
2019-04-04 14:58:54 +02:00
zah
ca4b971bc8 Initial version of the hot-code reloading support for native targets (#10729)
* squashed work by Zahary

* squashing a ton of useful history... otherwise rebasing on top of upstream Nim after commit 82c009a2cb would be impossible.

* Code review changes; Working test suite (without code reloading enabled)

* - documentation
- implemented the HCR test - almost works...
- fix the issue on Unix where for executable targets the source file for the main module of a project in nimcache was being overwritten with the binary itself (and thus the actual source code was lost)
- fixing embedded paths to shared objects on unix (the "lib" prefix was being prepended to the entire path instead of just the filename)
- other fixes
- removing unnecessary includes since that file is already included in chcks.nim which is in turn included in system.nim (and previously was getting imported in chcks.nim but then system.nim improts something... and that breaks HCR (perhaps it could be fixed but it would be nice not to import anything in system))

* fix for clang & C++ - explicitly casting a function pointer to void*
more stable mangling of parameter names when HCR is on
the length of the static arrays in the DatInit functions is now part of the name of the variables, so when they get resized they get also recreated
more stable mangling for inline functions - no longer depends on the module which first used them
work on the new complicated HCR test - turned surprisingly complex - WIP
test now successfully passes even when re-running `koch test` (previously when the nimcache wasn't cold that lead to errors)
better documentation
calling setStackBottomWith for PreMain
passes over the HcrInit/DatInit/Init calls of all modules are now in the proper order (first all of one type, then all of the next). Also typeinfo globals are registered (created) in a single pass before the DatInit pass (because of the way generic instantiations are handled)
Fix the test suite execution on macOs
fix for being able to query the program arguments when using HCR on posix!
other fixes

* Bugfix: Fix a compilation error in C++ mode when a function pointer
is converted to a raw pointer

* basic documentation for the new hot code reloading semantics

* Add change log entry

* Don't re-execute the top-level statements while reloading JS code

* fix a number of tests broken in a recent bugfix

* Review changes

* Added {.executeOnReload.} pragma that indicates top-level statements
  that should be executed on each reload. To make this work, I've modified
  the way the `if (hcr_init_) {...}` guards are produced in the init code.
  This still needs more work as the new guards seem to be inserted within
  the previously generated guards.

  This change also removes the need for `lastRegistedGlobal` in nimhcr.

* Implemented the `signatureHash` magic and the `hasModuleChanged` API
  depending on it (the actual logic is not imlemented yet).

* Add the "hcr" prefix to all HCR-related symbols in the system module.
  Added a new `hotcodereloading` module exporting the high-level API to
  the user.

  Besides being more hygienic, this was also required in order to make
  it possible to use macros in the high-level API. Without the split,
  `system` would have to import `macros`, which was going to produce
  the well-known init problems.

* Attempted to solve the "GC markers problem".

  Crashes were expected with the previous code, because the GC markers
  were compiled as normal procs are registered in the GC. When their
  module is unloaded, dangling pointers will remain in the GC tables.
  To solve this issue, I don't register any GC markers when HCR is on,
  but I add them to the HCR globals metadata and I use a single marker
  registed in nimhcr during the initialization of the system module that
  will be responsible for marking all globals.

* fix a compilation error

* - implemented the hasModuleChanged functionality
- tuples can be returned and broken into different vars in global scope
- added comments for the closnig scopes of the if statements in the init proc
- the new executeOnReload pragma works now!
- other fixes

* finally! fixing this hack in a proper way - declaring the destructor out of line (out of the class body) - we no longer need to forward-declare popCurrentExceptionEx

* Force full module parsing

This is a temporary hack that breaks some tests. I'll investigate
later how these can be fixed.

* tuples are now properly handled when global!

* these comments mess up the codegen in debug mode when $n is not actually a new line (or something like that) - these labels are intended only for GOTO labels anyway...

* "solved" the issue with the .pdb locks on windows when a binary is being debugged and hot code reloading is used at the same time

* fixes after rebasing...

* small fixes for the test

* better handling of globals! no more compiler crashes for locals with the global pragma, also simplified code around loops in global scope which have local vars (actually globals)

* we can now use the global pragma even for ... globals!

* the right output

* lets try those boehm GC tests

* after the test is ran it will be at its starting state - no git modifications

* clarification in the docs

* removed unnecessary line directives for forward declarations of functions - they were causing trouble with hot code reloading when no semantic change propagates to the main module but a line directive got changed and thus the main module had to be recompiled since the .c code had changed

* fixed bug! was inserting duplicate keys into the table and later was removing only 1 copy of all the duplicates (after a few reloads)

* no longer breaking into DatInit code when not supposed to

* fixes after rebasing

* yet more fixes after rebasing

* Update jssys.nim

* Rework the HCR path-handling logic

After reviewing the code more carefully, I've noticed that the old logic
will be broken when the user overrides the '--out:f' compiler option.

Besides fixing this issues, I took the opportunity to implement the
missing '--outdir:d' option.

Other changes:

* ./koch test won't overwrite any HCR and RTL builds located in nim/lib
* HCR and RTL are compiled with --threads:on by default

* Clean up the globals registration logic

* Handle non-flattened top-level stmtlists in JS as well

* The HCR is not supported with the Boehm GC yet

Also fixes some typos and the expected output of the HCR integration test

* The GC marker procs are now properly used as trampolines

* Fix the HCR integration test in release builds

* Fix ./koch tools

* this forward declaration doesn't seem to be necessary, and in fact breaks HCR because a 2nd function pointer is emitted for this externed/rtl func

* the forward declaration I removed in the last commit was actually necessary

* Attempt to make all tests green

* Fix tgenscript

* BAT file for running the HCR integration test on Windows [skip ci]

* Fix the docgen tests

* A final fix for Travis (hopefully)
2019-02-26 15:48:55 +01:00
Andreas Rumpf
d1fe195dcc nimpretty: explicit --indent option; fixes #9502; refs #9510 [backport] 2018-11-11 10:39:20 +01:00
Andreas Rumpf
532647171e nimpretty: fixes #9673 [backport] 2018-11-11 10:39:20 +01:00
Andreas Rumpf
03005fde99 nimpretty: fixes #9506 2018-10-26 01:53:10 +02:00
Araq
0afca3dd6b nimpretty: fixes #9504 2018-10-25 11:18:03 +02:00
Andreas Rumpf
5fd2827ab6 nimpretty: fixes #9499 2018-10-25 07:52:27 +02:00
Andreas Rumpf
778e4d1775 nimpretty: fixes #9144 2018-10-16 17:21:41 +02:00
Andreas Rumpf
f3c0703b7d nimpretty: add #!nimpretty on/off directives 2018-10-16 16:55:04 +02:00
Andreas Rumpf
ed38079b9b nimpretty: fixes #8626 2018-10-16 16:55:04 +02:00
Araq
f078f272e5 make tests green again 2018-09-07 19:21:17 +02:00
Araq
5976bd96be nimpretty: detect '; vs ,' style based on the first usage of the token in parameter lists 2018-06-26 01:43:41 +02:00
Araq
1be82d96a6 nimpretty: bugfixes; refs #8078 2018-06-20 11:35:36 +02:00
Andreas Rumpf
0725003a8c nimpretty: fixes more reported issues 2018-06-20 00:56:29 +02:00
Andreas Rumpf
c3090fcb48 nimpretty: don't produce trailing whitespace; fixes the rendering of unary operators 2018-06-19 23:45:11 +02:00
Andreas Rumpf
837d0c7270 nimpretty: proper command line handling; added tests; travis ensures these stay green 2018-06-19 20:06:04 +02:00
Andreas Rumpf
dd81d9d5b7 nimpretty improvements 2018-06-19 09:42:33 +02:00
Andreas Rumpf
98f3daea65 nimpretty: don't touch dense binary operators 2018-06-17 14:25:23 +02:00
Andreas Rumpf
dba26656f6 nimpretty: stuff that doesn't work 2018-06-16 19:02:47 +02:00
Andreas Rumpf
7819e63f77 nimpretty: more features 2018-06-16 09:53:36 +02:00
Andreas Rumpf
97398edc05 nimpretty: render and/or/notin/in properly 2018-06-16 01:58:52 +02:00
Andreas Rumpf
a1bd4a6cbd nimpretty: first version that seems useful for others to test it 2018-06-16 01:46:39 +02:00