diff --git a/documentation/Hydro.md b/documentation/Hydro.md index 82887c8..ef75f66 100644 --- a/documentation/Hydro.md +++ b/documentation/Hydro.md @@ -12,7 +12,10 @@ 7. [Multi Byte Instruction Layout](#multi-byte-instruction-layout) 1. [Push](#push) 2. [Jump](#jump) - 3. [] + 3. [Branch](#branch) + 4. [AllocArray](#allocarray) + 5. [AllocLayout](#alloclayout) + 6. [LayoutIndex](#layoutindex) ## Instructions and What They Do diff --git a/examples/hydro/fibonacci.h2o b/examples/hydro/fibonacci.h2o index 30d2356..bc7e7c5 100644 --- a/examples/hydro/fibonacci.h2o +++ b/examples/hydro/fibonacci.h2o @@ -30,5 +30,4 @@ main body call cast string push funcp std.io.print println - call - return \ No newline at end of file + call \ No newline at end of file diff --git a/ocean-language-support/intellij/ocean/.run/Build Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Build Plugin.run.xml new file mode 100644 index 0000000..1a0b1b2 --- /dev/null +++ b/ocean-language-support/intellij/ocean/.run/Build Plugin.run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/ocean-language-support/intellij/ocean/.run/Clean Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Clean Plugin.run.xml new file mode 100644 index 0000000..ef73e04 --- /dev/null +++ b/ocean-language-support/intellij/ocean/.run/Clean Plugin.run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/ocean-language-support/intellij/ocean/.run/Run IDE with Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Run IDE with Plugin.run.xml deleted file mode 100644 index f42721a..0000000 --- a/ocean-language-support/intellij/ocean/.run/Run IDE with Plugin.run.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - true - true - false - - - \ No newline at end of file diff --git a/ocean-language-support/intellij/ocean/.run/Run Plugin.run.xml b/ocean-language-support/intellij/ocean/.run/Run Plugin.run.xml new file mode 100644 index 0000000..5b45480 --- /dev/null +++ b/ocean-language-support/intellij/ocean/.run/Run Plugin.run.xml @@ -0,0 +1,25 @@ + + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/ocean-language-support/intellij/ocean/build.gradle.kts b/ocean-language-support/intellij/ocean/build.gradle.kts index 904aee2..753a2f3 100644 --- a/ocean-language-support/intellij/ocean/build.gradle.kts +++ b/ocean-language-support/intellij/ocean/build.gradle.kts @@ -23,7 +23,7 @@ sourceSets { // Configure Gradle IntelliJ Plugin // Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html intellij { - version.set("2023.3.2") + version.set("2022.2.5") type.set("IC") // Target IDE Platform plugins.set(listOf(/* Plugin Dependencies */)) @@ -55,7 +55,7 @@ tasks { patchPluginXml { sinceBuild.set("222") - untilBuild.set("233.*") + untilBuild.set("") } signPlugin { diff --git a/ocean-language-support/intellij/ocean/gradlew b/ocean-language-support/intellij/ocean/gradlew old mode 100644 new mode 100755 diff --git a/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/Hydro.flex b/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/Hydro.flex index 281e9d2..bd147a5 100644 --- a/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/Hydro.flex +++ b/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/Hydro.flex @@ -22,7 +22,6 @@ import static com.syrency.ocean.language.psi.HydroTypes.*; %type IElementType %unicode -EOL=\R WHITE_SPACE=\s+ NUMBER=-?(([0-9]+)|([0-9]*\.[0-9]+)) diff --git a/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/HydroIcons.java b/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/HydroIcons.java index 95b3ee1..d0a8318 100644 --- a/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/HydroIcons.java +++ b/ocean-language-support/intellij/ocean/src/main/java/com/syrency/ocean/language/HydroIcons.java @@ -5,5 +5,5 @@ import javax.swing.Icon; public class HydroIcons { - public static final Icon BASE = IconLoader.getIcon("/icons/hydro.svg"); + public static final Icon BASE = IconLoader.getIcon("/icons/hydro.svg", HydroIcons.class); }