From 0ecffa534fa654f0c2e99e3d6315baf2b127d00b Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 17 Mar 2021 11:52:57 -0600 Subject: [PATCH] remove extraneous return statements --- .../flixel/rpg-tutorial/source/Enemy.kiss | 18 ++++++--------- projects/flixel/rpg-tutorial/source/FSM.kiss | 8 +++---- projects/flixel/rpg-tutorial/source/Main.kiss | 3 +-- .../flixel/rpg-tutorial/source/MenuState.kiss | 5 ++--- .../flixel/rpg-tutorial/source/PlayState.kiss | 22 +++++++------------ .../flixel/rpg-tutorial/source/Player.kiss | 5 ++--- .../kiss-vscode/config/example/Config.kiss | 8 +++---- projects/kiss-vscode/src/Main.kiss | 5 ++--- 8 files changed, 28 insertions(+), 46 deletions(-) diff --git a/projects/flixel/rpg-tutorial/source/Enemy.kiss b/projects/flixel/rpg-tutorial/source/Enemy.kiss index 14e8fffa..f8cc5262 100644 --- a/projects/flixel/rpg-tutorial/source/Enemy.kiss +++ b/projects/flixel/rpg-tutorial/source/Enemy.kiss @@ -31,10 +31,9 @@ (set offset.y 2) (set brain (new FSM idle)) (set idleTimer 0) - (set playerPosition (FlxPoint.get)) - (return)) + (set playerPosition (FlxPoint.get))) -(defmethod &override update [:Float elapsed] +(defmethod &override :Void update [:Float elapsed] (when (and (or !(= velocity.x 0) !(= velocity.y 0)) (= touching FlxObject.NONE)) @@ -57,10 +56,9 @@ (animation.play "d")))) (brain.update elapsed) - (super.update elapsed) - (return)) + (super.update elapsed)) -(defmethod idle [:Float elapsed] +(defmethod :Void idle [:Float elapsed] (cond (seesPlayer // TODO (the FSM) here should not be necessary! @@ -78,11 +76,9 @@ }) (set idleTimer (FlxG.random.int 1 4))) (true - (-= idleTimer elapsed))) - (return)) + (-= idleTimer elapsed)))) -(defmethod chase [:Float elapsed] +(defmethod :Void chase [:Float elapsed] (if !seesPlayer (set brain.activeState idle) - (FlxVelocity.moveTowardsPoint this playerPosition (Std.int SPEED))) - (return)) \ No newline at end of file + (FlxVelocity.moveTowardsPoint this playerPosition (Std.int SPEED)))) \ No newline at end of file diff --git a/projects/flixel/rpg-tutorial/source/FSM.kiss b/projects/flixel/rpg-tutorial/source/FSM.kiss index 077d9691..512ceae3 100644 --- a/projects/flixel/rpg-tutorial/source/FSM.kiss +++ b/projects/flixel/rpg-tutorial/source/FSM.kiss @@ -1,9 +1,7 @@ (defprop &mut :Float->Void activeState null) (defmethod new [:Float->Void initialState] - (set activeState initialState) - (return)) + (set activeState initialState)) -(defmethod update [:Float elapsed] - (activeState elapsed) - (return)) \ No newline at end of file +(defmethod :Void update [:Float elapsed] + (activeState elapsed)) \ No newline at end of file diff --git a/projects/flixel/rpg-tutorial/source/Main.kiss b/projects/flixel/rpg-tutorial/source/Main.kiss index 7205073f..e73d5285 100644 --- a/projects/flixel/rpg-tutorial/source/Main.kiss +++ b/projects/flixel/rpg-tutorial/source/Main.kiss @@ -1,4 +1,3 @@ (defmethod new [] (super) - (addChild (new FlxGame 320 240 MenuState)) - (return)) \ No newline at end of file + (addChild (new FlxGame 320 240 MenuState))) \ No newline at end of file diff --git a/projects/flixel/rpg-tutorial/source/MenuState.kiss b/projects/flixel/rpg-tutorial/source/MenuState.kiss index cebfb2c4..2825a02b 100644 --- a/projects/flixel/rpg-tutorial/source/MenuState.kiss +++ b/projects/flixel/rpg-tutorial/source/MenuState.kiss @@ -1,10 +1,9 @@ (defprop &mut :FlxButton playButton null) -(defmethod &override create [] +(defmethod &override :Void create [] (set playButton (new FlxButton 0 0 "Play" clickPlay)) (playButton.screenCenter) - (add playButton) - (return)) + (add playButton)) (defun clickPlay [] (FlxG.switchState (new PlayState))) \ No newline at end of file diff --git a/projects/flixel/rpg-tutorial/source/PlayState.kiss b/projects/flixel/rpg-tutorial/source/PlayState.kiss index a9e5de05..da13ec91 100644 --- a/projects/flixel/rpg-tutorial/source/PlayState.kiss +++ b/projects/flixel/rpg-tutorial/source/PlayState.kiss @@ -4,8 +4,7 @@ (defprop &mut :FlxTypedGroup coins null) (defprop &mut :FlxTypedGroup enemies null) -// TODO make a &void meta -(defmethod &override create [] +(defmethod &override :Void create [] (set map (new FlxOgmo3Loader AssetPaths.turnBasedRPG__ogmo AssetPaths.room_001__json)) (set walls (map.loadTilemap AssetPaths.tiles__png "walls")) (walls.follow) @@ -18,10 +17,9 @@ (add enemies) (map.loadEntities placeEntities "entities") (FlxG.camera.follow player TOPDOWN 1) - (super.create) - (return)) + (super.create)) -(defmethod placeEntities [:EntityData entity] +(defmethod :Void placeEntities [:EntityData entity] (case entity.name ("player" (set player (new Player entity.x entity.y)) @@ -31,26 +29,22 @@ ("enemy" (enemies.add (new Enemy (+ entity.x 4) entity.y REGULAR))) ("boss" - (enemies.add (new Enemy (+ entity.x 4) entity.y BOSS)))) + (enemies.add (new Enemy (+ entity.x 4) entity.y BOSS))))) - (return)) - -(defmethod &override update [:Float elapsed] +(defmethod &override :Void update [:Float elapsed] (super.update elapsed) (FlxG.collide player walls) (FlxG.overlap player coins playerTouchCoin) (FlxG.collide enemies walls) - (enemies.forEachAlive checkEnemyVision) - (return)) + (enemies.forEachAlive checkEnemyVision)) -(defmethod checkEnemyVision [:Enemy enemy] +(defmethod :Void checkEnemyVision [:Enemy enemy] (if (walls.ray (enemy.getMidpoint) (player.getMidpoint)) { (set enemy.seesPlayer true) (set enemy.playerPosition (player.getMidpoint)) } - (set enemy.seesPlayer false)) - (return)) + (set enemy.seesPlayer false))) (defmethod playerTouchCoin [:Player player :Coin coin] (when (and player.alive player.exists coin.alive coin.exists) diff --git a/projects/flixel/rpg-tutorial/source/Player.kiss b/projects/flixel/rpg-tutorial/source/Player.kiss index 4ce3257c..9d166ff6 100644 --- a/projects/flixel/rpg-tutorial/source/Player.kiss +++ b/projects/flixel/rpg-tutorial/source/Player.kiss @@ -12,7 +12,7 @@ (setSize 8 8) (offset.set 4 4)) -(defmethod updateMovement [] +(defmethod :Void updateMovement [] (let [[&mut up &mut down &mut left &mut right] (map [[UP W] [DOWN S] [LEFT A] [RIGHT D]] FlxG.keys.anyPressed)] (when (and up down) @@ -60,8 +60,7 @@ (FlxObject.DOWN (animation.play "d")) (otherwise - (return)))) - (return))) + (return)))))) (defmethod &override update [:Float elapsed] (updateMovement) diff --git a/projects/kiss-vscode/config/example/Config.kiss b/projects/kiss-vscode/config/example/Config.kiss index 3d366b79..65b7f415 100644 --- a/projects/kiss-vscode/config/example/Config.kiss +++ b/projects/kiss-vscode/config/example/Config.kiss @@ -1,8 +1,6 @@ -(defun init [] +(defun :Void init [] (registerCommand "print a nice message" - (lambda [selectedText] + (lambda :Void [&opt selectedText] (infoMessage "Hello world!") (when selectedText - (infoMessage (+ "Also, " selectedText))) - (return))) - (return)) \ No newline at end of file + (infoMessage (+ "Also, " selectedText)))))) \ No newline at end of file diff --git a/projects/kiss-vscode/src/Main.kiss b/projects/kiss-vscode/src/Main.kiss index 69833546..751ba1f8 100644 --- a/projects/kiss-vscode/src/Main.kiss +++ b/projects/kiss-vscode/src/Main.kiss @@ -9,7 +9,7 @@ (defvar &mut activeConfigDir "") (defvar &mut :Dynamic config null) -(defun tryLoadConfig [&opt :String text] +(defun :Void tryLoadConfig [&opt :String text] (let [activeConfigPath (Path.join [activeConfigDir "config.js"]) backupConfigPath (Path.join [activeConfigDir (+ "config" (timeStamp) ".js")])] // Backup existing config.js @@ -50,8 +50,7 @@ (+ "Config failed to compile: " (if buildResult.error #| "" + buildResult.error|# - #| "" + buildResult.stderr |#)))))))) - (return)) + #| "" + buildResult.stderr |#))))))))) (defun _activate [:ExtensionContext context] (context.subscriptions.push