Jean Privat [Tue, 25 Apr 2017 00:17:17 +0000 (20:17 -0400)]
tests: add tests for nitin
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 21 Apr 2017 19:01:29 +0000 (15:01 -0400)]
contrib/nitin: new interactive interpreter proof of concept
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 21 Apr 2017 18:59:13 +0000 (14:59 -0400)]
nitc/toolcontext: make error_count writable
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 21 Apr 2017 18:57:08 +0000 (14:57 -0400)]
nitc/loader: always build the module importation
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 21 Apr 2017 18:56:47 +0000 (14:56 -0400)]
nitc/loader: load_rt_module returns the MModule
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 21 Apr 2017 18:56:07 +0000 (14:56 -0400)]
nitc/interpreter: NaiveInterpreter::mainmodule is writable
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Tue, 11 Apr 2017 12:30:27 +0000 (08:30 -0400)]
Merge: gamnit: virtual gamepad
Intro an easy to use virtual gamepad for quick ports of desktop games to mobiles devices with a touchscreen only. The gamepad is composed of up to 2 d-pads and up to 6 action buttons. Each button and direction on the pad is mapped to customizable keyboard keys. As such, it is ideal to simulate keyboard inputs on mobile devices.
The `virtual_gamepad` module uses the `app_files` annotation which automatically includes the required PNG files in Android's APK files when the module is imported.
The virtual gamepad is derived from the one in Asteronits, which it replaced. It is now used in Asteronits and Action Nitro, and it will be added to Devil's Avocados as soon as this is merged. The gamepad comes with a selection of button allowing for some customization, however custom buttons are also supported.
Usage example from Devil's Avocados:
~~~
var gamepad = new VirtualGamepad
gamepad.add_dpad
gamepad.add_button("q", gamepad_spritesheet.turn_left)
gamepad.add_button("e", gamepad_spritesheet.turn_right)
gamepad.add_button("space", gamepad_spritesheet.star)
gamepad.visible = true
app.gamepad = gamepad
~~~
And the result, on Android:
![screenshot_20170404-125407](https://cloud.githubusercontent.com/assets/208057/
24668912/
641d091a-1936-11e7-81ff-
eaf026540db6.png)
This version should manage quite well the edge cases of touchscreen controls, which explains the complexity of `virtual_gamepad.nit`. However it is still limited, future work could add:
- Virtual analog joystick, it would be easier to code than the d-pad.
- Abstraction for gamepads (and analog joysticks). This would require unification with the current Android physical gamepad support and implementing desktop physical gamepad support with SDL2.
Pull-Request: #2405
Reviewed-by: Romain Chanoir <romain.chanoir@viacesi.fr>
Reviewed-by: Jean Privat <jean@pryen.org>
Jean Privat [Tue, 11 Apr 2017 12:30:26 +0000 (08:30 -0400)]
Merge: gamnit: abstract camera scroll and zoom service
The new service `accept_scroll_and_zoom` lets the user adjust the camera using platform specific controls. On desktop computers, the mouse wheel controls the zoom and the middle mouse button drags the world/camera. On Android, a pinch gesture controls the zoom and 2 fingers slide the scroll.
This reuse the previous `accept_two_fingers_motion` and intro an implementation for desktop computers. It will be used by, at least, Sputnit in which it will replace the current implementation which is broken since the upgrade to SDL2.
Pull-Request: #2407
Jean Privat [Tue, 11 Apr 2017 12:30:24 +0000 (08:30 -0400)]
Merge: gamnit: intro dynamic resolution support
The dynamic resolution can change while the game is running to reduce the load on the GPU when more performance is needed. So an action scene may display tons of explosions and maintain a good framerate by reducing the number of pixels on screen, and a calm scene may gain back the full resolution to better show details.
At this point, the dynamic resolution must be set manually by the user (using something like a video quality slider) or by some heuristic. Future improvement could autodetect skipped frame and set the resolution accordingly.
While the current set of gamnit games rarely overload a GPU, there is many scenarios where a dynamic resolution can be useful: mobile device with a high-resolution display and a limited battery, 4K Android TVs and a VR headset that must maintain 90 FPS.
In Asteronits, the keys `, and .` change the dynamic resolution. Here are a few screenshots of the results.
At 1.0, the native resolution:
![screenshot from 2017-04-06 13 14 08](https://cloud.githubusercontent.com/assets/208057/
24768761/
cfd3bd6a-1ad1-11e7-993b-
5f2e76034a31.png)
At 0.25:
![screenshot from 2017-04-06 13 14 25](https://cloud.githubusercontent.com/assets/208057/
24768762/
d2292b36-1ad1-11e7-84b2-
7b3ab602cd67.png)
At 0.03: (I wouldn't recommend using this value by default)
![screenshot from 2017-04-06 13 14 34](https://cloud.githubusercontent.com/assets/208057/
24768771/
df0ac0d0-1ad1-11e7-8493-
7efb2e7c30fc.png)
Pull-Request: #2408
Alexis Laferrière [Fri, 31 Mar 2017 16:37:03 +0000 (12:37 -0400)]
gamnit: world_camera position defaults to 1080 pixels in height
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 31 Mar 2017 16:36:16 +0000 (12:36 -0400)]
asteronits: change dynamic resolution with , and .
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 31 Mar 2017 02:15:23 +0000 (22:15 -0400)]
gamnit: intro dynamic resolution support
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 31 Mar 2017 20:27:56 +0000 (16:27 -0400)]
glesv2: intro param to get names of bound entities
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 31 Mar 2017 20:07:33 +0000 (16:07 -0400)]
glesv2: small (but important) fixes
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Wed, 5 Apr 2017 19:10:22 +0000 (15:10 -0400)]
gamnit: implement `camera_control` for linux
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Wed, 5 Apr 2017 19:05:45 +0000 (15:05 -0400)]
gamnit: intro `camera_control` an abstraction of `accept_two_fingers_motion`
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Wed, 5 Apr 2017 19:05:30 +0000 (15:05 -0400)]
sdl2 & gamnit: add mouse wheel events
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Wed, 5 Apr 2017 14:42:16 +0000 (10:42 -0400)]
action_nitro: add f-droid package description file
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Tue, 4 Apr 2017 21:52:48 +0000 (17:52 -0400)]
gamnit: fix clearing reference to context in sprites too
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 20:48:41 +0000 (16:48 -0400)]
gamnit: add example to `gamnit::keys`
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Jean Privat [Wed, 5 Apr 2017 00:30:35 +0000 (20:30 -0400)]
Merge: inkscape_tools: support Inkscape versions before and after 0.92
Inkscape changed the default DPI at version 0.92. This PR improves `svg_to_png_and_nit` to set the default DPI according to the detected Inkscape version, 90 DPI up until version 0.92 and 96 DPI for version 0.92 and later.
Reference: http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92#Important_changes
This is a more portable solution than #2374.
Pull-Request: #2406
Jean Privat [Wed, 5 Apr 2017 00:30:07 +0000 (20:30 -0400)]
Merge: GC now collect cycles
This fixes an issue with the actor model where the GC is unable to collect cycles associated with actors objects and printing an annoying warning
Theses modifs should fix the tests in #2401
The downside is that the finalization is no longer in topological order
Pull-Request: #2404
Jean Privat [Wed, 5 Apr 2017 00:30:03 +0000 (20:30 -0400)]
Merge: Some minor fixes to actors examples
Tried to follow @tremblay-guy commentaries on #2361 to improve the code of the actors examples
Pull-Request: #2401
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 04:06:43 +0000 (00:06 -0400)]
action_nitro: intro Android client with gamepad and icon
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 04:06:29 +0000 (00:06 -0400)]
action_nitro: general gameplay tweaks
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 17:38:28 +0000 (13:38 -0400)]
asteronits: use the new touch gamepad
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 04:05:42 +0000 (00:05 -0400)]
gamnit: intro virtual gamepad
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Tue, 4 Apr 2017 20:06:41 +0000 (16:06 -0400)]
inkscape_tools: support Inkscape versions before and after 0.92
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 17:39:46 +0000 (13:39 -0400)]
gamnit: intro more anchor points
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 04:07:12 +0000 (00:07 -0400)]
gamnit: fix Y axis un `screen_to_ui`
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 2 Apr 2017 17:39:00 +0000 (13:39 -0400)]
mnit::input: move up pointer id
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
BlackMinou [Mon, 3 Apr 2017 17:24:01 +0000 (13:24 -0400)]
fix the GC warning about cycles
Signed-off-by: BlackMinou <romain.chanoir@viacesi.fr>
BlackMinou [Mon, 3 Apr 2017 17:46:14 +0000 (13:46 -0400)]
Update the doc for Finalizable
Signed-off-by: BlackMinou <romain.chanoir@viacesi.fr>
BlackMinou [Wed, 29 Mar 2017 18:55:03 +0000 (14:55 -0400)]
Actors example Chameneos redux fixes
Signed-off-by: BlackMinou <romain.chanoir@viacesi.fr>
BlackMinou [Wed, 29 Mar 2017 18:55:10 +0000 (14:55 -0400)]
Actors example Fannkuch redux fixes
Signed-off-by: BlackMinou <romain.chanoir@viacesi.fr>
BlackMinou [Wed, 29 Mar 2017 18:55:18 +0000 (14:55 -0400)]
Actors example Mandelbrot fixes
Signed-off-by: BlackMinou <romain.chanoir@viacesi.fr>
BlackMinou [Wed, 29 Mar 2017 18:54:12 +0000 (14:54 -0400)]
Actors example Thread ring fixes
Signed-off-by: BlackMinou <romain.chanoir@viacesi.fr>
Jean Privat [Tue, 28 Mar 2017 12:27:49 +0000 (08:27 -0400)]
Merge: intrepreter: Fix the documentation of `PrimitiveInstance`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Pull-Request: #2400
Jean Privat [Tue, 28 Mar 2017 12:27:46 +0000 (08:27 -0400)]
Merge: intrepreter: Fix the documentation of `Instance::is_true`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Pull-Request: #2399
Jean Privat [Tue, 28 Mar 2017 12:27:44 +0000 (08:27 -0400)]
Merge: compiler: Refactor
Various minor refactorings done for PR #2397.
Pull-Request: #2398
Reviewed-by: Jean Privat <jean@pryen.org>
Jean Privat [Tue, 28 Mar 2017 12:27:32 +0000 (08:27 -0400)]
Merge: gamnit: optimize the `flat` 2D api using GPU buffers
`gamnit::flat` is an API to quickly and easily write 2D games, it is built around sprites added to either the world `sprites` or to the `ui_sprites` sets. However, the absolute lack of optimization led to slow performances when there was a large number of sprites.
This PR rewrites the implementation of the `flat` API using vertex buffer objects (VBO) to keep sprite data in the GPU memory. The data is updated only when an attribute of a sprite is modified.
The result is 200 times higher framerate in the new minimal program `template_flat` with 2000 sprites and random modifications, going from ~10 FPS to ~2000 FPS.
This requires managing the memory of the GPU, growing it as needed, keeping a list of freed spaces and defragmenting it to compress the data after sprite deletion. The GPU memory is simulated by the `GroupedArray` class, it keeps a bit more information than needed but it would also support objects with varying sizes like the 3D models of the `depth` API. All sprites are sorted when added to either `sprites` or `ui_sprites` allowing for bulk drawing of sprites using the same pixel data and usage type.
This PR extends the current API by adding a few new services:
* The attribute `Sprite::static`, when at `true`, gives a hint to the framework that this sprite won't change often and that it is added in bulk with other static sprites. This value can be ignored in the prototyping phase of a game and added when better performances are needed.
* The pseudo attributes `red`, `green` and `blue` modifies the tint of a sprite. They are more intuitive to use than the array `tint` and they allow for an automatic update of the related data on the GPU.
There is two downsides to this implementation:
* The attribute `Point3d::sprites` is added by refinement to all 3D points, even those not used directly by the graphics framework. Hopefully it will add only a small overhead, and (of course) only in clients of gamnit games.
* There is no easily predictable order in which the sprites are drawn anymore. Causing issues with non-opaque sprites which should normally be drawn last. This could be fixed by a new sprite category or a boolean attribute similar to `static`.
Pull-Request: #2395
Reviewed-by: Jean Privat <jean@pryen.org>
Jean-Christophe Beaupré [Tue, 28 Mar 2017 04:16:02 +0000 (00:16 -0400)]
intrepreter: Fix the documentation of `PrimitiveInstance`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Tue, 28 Mar 2017 04:14:30 +0000 (00:14 -0400)]
intrepreter: Fix the documentation of `Instance::is_true`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Alexis Laferrière [Fri, 24 Mar 2017 00:26:04 +0000 (20:26 -0400)]
gamnit: make SpriteSet behave more like a Set
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Jean Privat [Mon, 27 Mar 2017 13:13:56 +0000 (09:13 -0400)]
Merge: mdoc_or_fallback: Refactor
Centralize its definition and update its documentation.
Pull-Request: #2231
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Jean-Christophe Beaupré [Fri, 24 Mar 2017 04:42:41 +0000 (00:42 -0400)]
model: Make the `anchor` parameter of `MType::anchor_to` nullable
Refactor the code of `TypeVisitor::anchor_to`.
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Sun, 26 Mar 2017 02:43:13 +0000 (22:43 -0400)]
model: Add a constant for the bottom type
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Fri, 24 Mar 2017 04:39:52 +0000 (00:39 -0400)]
model: Add precision to the documentation of type metrics
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Fri, 24 Mar 2017 04:37:11 +0000 (00:37 -0400)]
model: Fix indentation
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Sat, 25 Mar 2017 02:45:14 +0000 (22:45 -0400)]
java_compiler: Fix the documentation of `is_java_primitive`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Sat, 25 Mar 2017 02:44:44 +0000 (22:44 -0400)]
compiler: Merge `maybenull` and `maybe_null`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean Privat [Fri, 24 Mar 2017 16:09:58 +0000 (12:09 -0400)]
Merge: hash_collections: Fix the documentation of `Set::new`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Pull-Request: #2393
Alexis Laferrière [Thu, 23 Mar 2017 21:15:11 +0000 (17:15 -0400)]
nitunit: intrude import modules to test private entities
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 17 Mar 2017 02:42:38 +0000 (22:42 -0400)]
gamnit: intro a template project for 2D games
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 17 Mar 2017 02:40:50 +0000 (22:40 -0400)]
gamnit: fix standalone triangle
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Thu, 23 Mar 2017 17:40:17 +0000 (13:40 -0400)]
action_nitro: update for the improved flat API and for a better look
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 10 Mar 2017 14:50:24 +0000 (09:50 -0500)]
action_nitro: bug fix
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Thu, 23 Mar 2017 16:59:40 +0000 (12:59 -0400)]
gamnit: intro color services to `Sprite`
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Mon, 20 Mar 2017 15:32:02 +0000 (11:32 -0400)]
gamnit: rewrite implementation to use VBOs
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 17 Mar 2017 01:40:48 +0000 (21:40 -0400)]
c & matrix: make some services public for low level clients
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Thu, 16 Mar 2017 03:50:32 +0000 (23:50 -0400)]
glesv2: add integer variants to operations on buffers
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Mon, 20 Mar 2017 15:35:40 +0000 (11:35 -0400)]
glesv2: intro buffer services
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Mon, 6 Mar 2017 19:41:54 +0000 (14:41 -0500)]
gamnit: time the performance of the core services
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sun, 19 Mar 2017 22:42:19 +0000 (18:42 -0400)]
core: implement `MinHeap::clear` and intro `Pointer::nul`
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Jean-Christophe Beaupré [Wed, 22 Mar 2017 20:34:56 +0000 (16:34 -0400)]
hash_collections: Fix the documentation of `Set::new`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Mon, 22 Aug 2016 20:36:19 +0000 (16:36 -0400)]
model: Document base cases of `mdoc_or_fallback`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Thu, 14 Jul 2016 17:05:52 +0000 (13:05 -0400)]
mdoc: Fix documentation of `mdoc_or_fallback`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Mon, 22 Aug 2016 20:35:02 +0000 (16:35 -0400)]
highlight: Use `mdoc_or_fallback`
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean-Christophe Beaupré [Mon, 22 Aug 2016 20:25:23 +0000 (16:25 -0400)]
model: Promote definitions of `mdoc_or_fallback`
Merge duplicates.
Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Jean Privat [Wed, 22 Mar 2017 12:50:22 +0000 (08:50 -0400)]
Merge: oot: add Devil's Avocados, a Recipe Preparation Game
Pull-Request: #2392
Jean Privat [Mon, 20 Mar 2017 20:11:28 +0000 (16:11 -0400)]
oot: add Devil's Avocados, a Recipe Preparation Game
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Mon, 20 Mar 2017 20:09:01 +0000 (16:09 -0400)]
Merge: typing: add services for intersecting and subtracting types
Nit does not have intersection nor union types, however, the intersection and the difference operations on types are needed for a better behavior of the adaptive typing system.
Currently, the only need of type intersection and type difference is with `isa`. The previous implementation did not really implement them and only did the following:
~~~nit
var x: X
...
if x isa Y then
# if X<:Y then x is still a X (and you get a warning) else x is now a Y
...
else
# nothing never change here. x is a X
...
end
~~~
Now, the `then` branch, handle the merge of nullable types and the `else` branch might also be adapted.
~~~nit
var x: nullable X # where Y <: X
...
if x isa Object then
# x is a X (instead of Object as before)
else
# x is null (instead of nullable X as before)
end
if x isa nullable Object then # warning, useless isa
# x is a nullable X (as before)
else
# x is dead (instead of nullable X as before)
end
if x isa Y then
# x is a Y (same as before)
else
# x is a nullable X (same as before)
end
if x isa nullable Y then
# x is a nullable Y (as before)
else
# x is a X without nullable (instead of nullable X as before)
end
~~~
I do not expect that these change improve that much the expressiveness of the language. However, it makes the type system a little more consistent and a little less hackish.
Pull-Request: #2385
Reviewed-by: Jean-Christophe Beaupré <jcbrinfo.public@gmail.com>
Jean Privat [Mon, 20 Mar 2017 20:09:00 +0000 (16:09 -0400)]
Merge: grammar: add union and intersection types
This is a stub in the grammar to add intersection and union types.
* `var x: A and B`
* `var x: A or B and C or D or E`
Adding parenthesis `(A and B) or C` cause some nasty conflicts because the Nit grammar is very complex and organic (and sablecc is nowadays more a curse than a blessing).
all usage of types accept intersection and union except `new` and `isa` because LR1 conflicts with the boolean `or`.
* `x isa A or...`: shift type (`x isa A or B`) vs. reduce expr (`x isa A or true`)
This is not too much a problem because:
* intersection and union type are abstract (no `new`)
* `a isa A or B` should be the same than `a isa A or a isa B`
Note that this is only a stub: only the grammar is extended:
* there is no new AST node (`A or B` is parsed as `A`, the `B` is just dropped)
* there is no change in the metamodel of Nit
Pull-Request: #2389
Reviewed-by: Jean-Christophe Beaupré <jcbrinfo.public@gmail.com>
Jean Privat [Mon, 20 Mar 2017 20:08:59 +0000 (16:08 -0400)]
Merge: Docker, portability and crosscompiling tweaks
* Add the missing SDL2 package (since #2376) to the full DockerFile.
* Fix a warning raised by the C compiler when called by niti on 32 bits platforms.
* Clean up Makefile generation and enable using environment variables to override the default C compiler, C++ compiler, CFLAGS and whether or not to use libunwind. Making it possible to change the compiler for cross compilation and to skip linking with libunwind to create binaries compatible with more GNU/Linux systems.
Pull-Request: #2390
Reviewed-by: Romain Chanoir <romain.chanoir@viacesi.fr>
Jean Privat [Mon, 20 Mar 2017 20:08:59 +0000 (16:08 -0400)]
Merge: Windows: path, PATH, and exec improvements
This PR further improves Windows support in the Nit standard library and testing tools:
* Improve Windows path manipulation and standardize the solution. On Windows, services working on path strings first replace all `\` by `/`. This allows sharing the main code with other OS, data copy should be limited since only the first operation on a string should update it.
All `file` services depending on the path separator should have been updated, except for `relpath`. Note that there is still no special treatment for FS root like `C:/`, so further work is needed.
* Support for Windows' PATH where the separator is `;`.
* Fix pipes left open on the parent side after `CreateProcess`.
* Intro a basic skip list for MINGW64 Windows system with projects that are either incompatible (cocoa & ios) or not available with msys2 and that I don't plan to configure manually on the test server in the near future.
There are still issues (including an int overflow in `Float::to_s`), but this PR allows a few larger projects to work on Windows. With #2390 gamnit projects can be compiled entirely from a Windows machine (or cross-compiled).
---
The unit tests are marked `~~~nitish` because they are only valid when `is_windows == true`. Maybe we could have a `~~~nitwindows` or something like that for such tests in the future. Note that you can set `-D is_windows=true` to try them (but not on nitunit sadly).
The Jenkins Windows test server is currently broken. I'll see if I can fix it, otherwise, I'll share the results form my test server later.
Pull-Request: #2391
Reviewed-by: Jean-Christophe Beaupré <jcbrinfo.public@gmail.com>
Alexis Laferrière [Fri, 17 Mar 2017 23:11:04 +0000 (19:11 -0400)]
tests: add basic MINGW64 skip list
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Thu, 16 Mar 2017 17:23:15 +0000 (13:23 -0400)]
exec: close child pipes from the parent process
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Thu, 16 Mar 2017 17:12:48 +0000 (13:12 -0400)]
core: split PATH on ; on Windows
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Fri, 24 Feb 2017 05:01:08 +0000 (00:01 -0500)]
core: standardize Windows path handling
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Thu, 2 Mar 2017 19:51:15 +0000 (11:51 -0800)]
core: 32 bits fixes
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Tue, 14 Mar 2017 01:00:39 +0000 (21:00 -0400)]
nitc: let CC, CXX and NO_STACKTRACE use env value
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Tue, 14 Mar 2017 00:20:57 +0000 (20:20 -0400)]
nitc: clean up makefile header generation
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Alexis Laferrière [Sat, 11 Mar 2017 06:00:18 +0000 (01:00 -0500)]
docker: add missing libsdl2-image-dev
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Jean Privat [Fri, 10 Mar 2017 17:08:37 +0000 (12:08 -0500)]
tests: update more sav because of the improved null-aware adaptive typing
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 10 Mar 2017 16:35:08 +0000 (11:35 -0500)]
parser: regenerate with union and intersection types
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 10 Mar 2017 16:34:48 +0000 (11:34 -0500)]
parser: add syntax for union and intersection types
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 10 Mar 2017 15:36:24 +0000 (10:36 -0500)]
tests: add base_adaptive_full.nit with a lots of pattenrns
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 10 Mar 2017 15:32:15 +0000 (10:32 -0500)]
nitc: adaptive typing apply non-nullness when fallbacking
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Fri, 10 Mar 2017 13:37:49 +0000 (08:37 -0500)]
tests: update test_isa_nil message
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Thu, 2 Mar 2017 21:06:45 +0000 (16:06 -0500)]
nitc/typing: isa uses intersect_types and diff_types
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Thu, 2 Mar 2017 21:06:08 +0000 (16:06 -0500)]
nitc/typing: add intersect_types and diff_types
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Thu, 2 Mar 2017 21:05:45 +0000 (16:05 -0500)]
nitc/typing: document `merge_types`
Signed-off-by: Jean Privat <jean@pryen.org>
Jean Privat [Thu, 9 Mar 2017 15:12:56 +0000 (10:12 -0500)]
Merge: realtime: 32 bits compatibility
Fix `realtime::Timespec` services on 32 bits systems and Windows by moving some critical code to C. This PR does not change the API. However, I have plans for a future revamp of the API to reduce the number of mallocs.
Pull-Request: #2380
Reviewed-by: Jean Privat <jean@pryen.org>
Jean Privat [Thu, 9 Mar 2017 15:12:55 +0000 (10:12 -0500)]
Merge: nitweb: load catalog at startup instead of first page display
So the first user to access Nitweb does not have to wait 5 minutes for the catalog to be compiled.
Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
Pull-Request: #2387
Jean Privat [Thu, 9 Mar 2017 15:12:55 +0000 (10:12 -0500)]
Merge: lib/json: fix array serialization
Fixes serialization error for array subclasses.
Be the following Nit code:
~~~nit
class Foo
super Array[String]
serialize
var foo: String
end
print (new Foo("foo")).serialize_to_json
~~~
Output before:
~~~json
{"__kind":"obj","__id":0,"__class":"Foo", "__items":, "foo":"foo"[]}
~~~
Output after:
~~~json
{"__kind":"obj","__id":0,"__class":"Foo", "foo":"foo", "__items":[]}
~~~
Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
Pull-Request: #2388
Alexandre Terrasa [Mon, 6 Mar 2017 23:17:13 +0000 (18:17 -0500)]
lib/json: fix array serialization
Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
Alexandre Terrasa [Fri, 17 Feb 2017 02:10:09 +0000 (21:10 -0500)]
nitweb: load catalog at startup instead of first page display
Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
Jean Privat [Mon, 6 Mar 2017 16:14:55 +0000 (11:14 -0500)]
Merge: regen csrc for Windows and to fix 32 bits support
Fix #2355.
Pull-Request: #2382
Alexis Laferrière [Fri, 24 Feb 2017 04:15:49 +0000 (23:15 -0500)]
realtime: 32 bits safe
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Jean Privat [Fri, 3 Mar 2017 17:52:01 +0000 (12:52 -0500)]
Merge: OSX use gtime
This could help to track why jenkins runs on osx are so slow
Pull-Request: #2384