wip

.gitignore

+.gradle/
+.idea/

.gitmodules

+[submodule "extendj"]
+	path = extendj
+	url = git@git-st.inf.tu-dresden.de:jastadd/extendj.git

build.gradle

+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This is a general purpose Gradle build.
+ * Learn how to create Gradle builds at https://guides.gradle.org/creating-new-gradle-builds/
+ */
+
+task benchmark(type: Exec) {
+    workingDir 'scripts'
+
+    commandLine 'python3', 'run.py', '-m'
+}

dg/src/main/jastadd/DependencyGraph.relast

+DependencyGraph ::= Component*;
+Component;
+rel Component.Dependency* -> Component;

dg/src/main/jastadd/DependencyGraphReachability.jrag

+aspect Reachability {
+  syn Set<Component> Component.reachable() circular [new HashSet<>()] {
+    Set<Component> result = new HashSet<>();
+    for (Component to: getDependencyList()) {
+      result.add(to);
+      result.addAll(to.reachable());
+    }
+    return result;
+  }
+
+  syn Set<Component> Component.inverseReachable() circular [new HashSet<>()] {
+    Set<Component> result = new HashSet<>();
+    for (Component from: getDependencyList()) {
+      result.add(from);
+      result.addAll(from.inverseReachable());
+    }
+    return result;
+  }
+
+  syn boolean Component.hasCycle() = reachable().contains(this);
+
+  syn Set<Component> Component.SCC() {
+    Set<Component> result = new HashSet<>(reachable());
+    result.retainAll(inverseReachable());
+    return result;
+  }
+
+  coll HashSet<Set<Component>> DependencyGraph.SCC() with add root DependencyGraph;
+  Component contributes SCC() when SCC().size() > 0 to DependencyGraph.SCC();
+}

extendj @ 4c5f96e5

+Subproject commit 4c5f96e59a825bf17c98fbfa0f6786e0d2e0152e

gradle/wrapper/gradle-wrapper.properties

+#Thu Jun 20 16:28:16 CEST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip

gradlew

+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

jastadd_modules

+include("extendj/java4/jastadd_modules")
+include("extendj/java5/jastadd_modules")
+include("extendj/java6/jastadd_modules")
+include("extendj/java7/jastadd_modules")
+include("extendj/java8/jastadd_modules")
+include("extendj/java8relast/jastadd_modules")
+

settings.gradle

+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/4.10.3/userguide/multi_project_builds.html
+ */
+
+rootProject.name = 'sle19-impl'
+
+include 'statemachine'
+include 'dg'
+include 'extendj'
+include 'extendj:java4'
+include 'extendj:java5'
+include 'extendj:java6'
+include 'extendj:java7'
+include 'extendj:java8'
+include 'extendj:java8relast'

statemachine/.gitignore

+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+out/
+*.iml
+/.idea/*
+!.idea/codeStyles
+!libs/relast.jar
+
+src/gen/
+build/

statemachine/build.gradle

+group 'de.tudresden.inf.st'
+version '1.0-SNAPSHOT'
+
+apply plugin: 'java'
+apply plugin: 'application'
+apply plugin: 'idea'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+idea {
+    module {
+        generatedSourceDirs += file('./src/gen/java')
+    }
+}
+
+configurations {
+    ragdoc
+}
+
+sourceSets {
+    main {
+        java.srcDir "src/gen/java"
+    }
+}
+
+//test {
+//    useJUnitPlatform()
+//}
+
+task cleanRagdoc(type: Delete) {
+    group = 'documentation'
+    new File(docsDir, 'ragdoc').deleteDir()
+}
+
+
+dependencies {
+
+    compile 'org.jastadd:jastadd:2.3.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.4.0'
+    testCompile 'org.assertj:assertj-core:3.12.1'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0'
+
+    ragdoc files('libs/rd-builder.jar')
+}
+
+//run {
+//    mainClassName = 'de.tudresden.inf.st.sle19.Main'
+//    standardInput = System.in
+//    if (project.hasProperty("appArgs")) {
+//        args Eval.me(appArgs)
+//    }
+//}
+
+buildscript {
+    repositories.mavenCentral()
+}
+
+
+jar {
+    manifest {
+        attributes(
+                'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
+                'Main-Class': 'de.tudresden.inf.st.sle19.Main'
+        )
+    }
+}
+
+task preprocess(type: JavaExec) {
+    group = 'Build'
+    main = "-jar"
+
+    doFirst {
+        delete "./src/gen/jastadd/*.ast"
+        delete "./src/gen/jastadd/StateMachine.jadd"
+        delete "./src/gen/jastadd/StateMachineRefResolver.jadd"
+        delete "./src/gen/jastadd/StateMachineResolverStubs.jrag"
+        delete "./src/gen/jastadd/StateMachineSerializer.jadd"
+        mkdir  "src/gen/jastadd/"
+    }
+
+    args = [
+            "libs/relast.jar",
+            "./src/main/jastadd/StateMachine.relast",
+            "../dg/src/main/jastadd/DependencyGraph.relast",
+            "./src/main/jastadd/mapping/SMtoDG.relast",
+            "--listClass=ArrayList",
+            "--jastAddList=JastAddList",
+            "--serializer=jackson",
+            "--useJastAddNames",
+            "--file",
+            "--resolverHelper",
+            "--grammarName=./src/gen/jastadd/StateMachine"
+    ]
+
+    inputs.files file("./src/main/jastadd/StateMachine.relast"),
+            file("../dg/src/main/jastadd/DependencyGraph.relast"),
+            file("./src/main/jastadd/mapping/SMtoDG.relast"),
+            file("./libs/relast.jar")
+    outputs.files file("./src/gen/jastadd/StateMachine.ast"),
+            file("./src/gen/jastadd/StateMachine.jadd"),
+            file("./src/gen/jastadd/StateMachineRefResolver.jadd"),
+            file('./src/gen/jastadd/StateMachineResolverStubs.jrag'),
+            file("./src/gen/jastadd/StateMachineSerializer.jadd")
+}
+
+task jastadd2(type: JavaExec) {
+    classpath=configurations.compile
+    group = 'Build'
+    main = 'org.jastadd.JastAdd'
+    args = ["--cache=all",
+            "--flush=full",
+            "--list=JastAddList",
+            "--rewrite=cnta",
+            "--visitCheck=false",
+            "--package=de.tudresden.inf.st.sle19.jastadd.model",
+            "--o=src/gen/java"
+    ] + fileTree("./src/main/jastadd/").matching {exclude "**/*.relast"} + fileTree("../dg/src/main/jastadd/").matching {exclude "**/*.relast"} + file("./src/gen/jastadd/StateMachine.ast") + file("./src/gen/jastadd/StateMachine.jadd") + file("./src/gen/jastadd/StateMachineRefResolver.jadd") + file('./src/gen/jastadd/StateMachineResolverStubs.jrag') + file("./src/gen/jastadd/StateMachineSerializer.jadd")
+
+    doFirst {
+        delete fileTree('src/gen/java/')
+        mkdir 'src/gen/java/'
+    }
+
+    inputs.files fileTree("src/main/jastadd/") + fileTree("src/gen/jastadd/") + file("libs/jastadd2.jar")
+    outputs.files fileTree("src/gen/java/")
+}
+
+clean.doFirst {
+    delete "./src/gen/jastadd/StateMachine.ast"
+    delete "./src/gen/jastadd/StateMachine.jadd"
+    delete "./src/gen/jastadd/StateMachineSerializer.jadd"
+    delete "./src/gen/jastadd/StateMachineRefResolver.jadd"
+    delete "./src/gen/jastadd/StateMachineResolverStubs.jrag"
+}
+
+
+jastadd2.dependsOn preprocess
+compileJava.dependsOn jastadd2

statemachine/simpleSM.json

+{"type":"StateMachine","id":"0","children":{"Element":[{"type":"State","id":"a","children":{"Label":"a"},"relations":{"Outgoing":["af","ab"],"Incoming":["fa"]}},{"type":"State","id":"b","children":{"Label":"b"},"relations":{"Outgoing":["bc","bd"],"Incoming":["ab","eb"]}},{"type":"State","id":"c","children":{"Label":"c"},"relations":{"Outgoing":["ce"],"Incoming":["bc"]}},{"type":"State","id":"d","children":{"Label":"d"},"relations":{"Outgoing":[],"Incoming":["bd","ed"]}},{"type":"State","id":"e","children":{"Label":"e"},"relations":{"Outgoing":["eb","ed"],"Incoming":["ce"]}},{"type":"State","id":"f","children":{"Label":"f"},"relations":{"Outgoing":["fa"],"Incoming":["af"]}},{"type":"Transition","id":"af","children":{"Label":"af"},"relations":{"From":"a","To":"f"}},{"type":"Transition","id":"af","children":{"Label":"af"},"relations":{"From":"a","To":"f"}},{"type":"Transition","id":"bc","children":{"Label":"bc"},"relations":{"From":"b","To":"c"}},{"type":"Transition","id":"bd","children":{"Label":"bd"},"relations":{"From":"b","To":"d"}},{"type":"Transition","id":"ce","children":{"Label":"ce"},"relations":{"From":"c","To":"e"}},{"type":"Transition","id":"eb","children":{"Label":"eb"},"relations":{"From":"e","To":"b"}},{"type":"Transition","id":"ed","children":{"Label":"ed"},"relations":{"From":"e","To":"d"}},{"type":"Transition","id":"fa","children":{"Label":"fa"},"relations":{"From":"f","To":"a"}}]},"relations":{"Initial":"a","Final":["e","f"]}}
\ No newline at end of file

statemachine/src/main/jastadd/Analysis.jrag

+aspect Analysis {
+
+}

statemachine/src/main/jastadd/Navigation.jrag

+aspect Navigation {
+
+  syn boolean Element.isState() = false;
+  eq State.isState() = true;
+
+  syn State Element.asState() = null;
+  eq State.asState() = this;
+
+  syn boolean Element.isTransition() = false;
+  eq Transition.isTransition() = true;
+
+  syn Transition Element.asTransition() = null;
+  eq Transition.asTransition() = this;
+
+  syn List<State> StateMachine.states() {
+    List<State> states = new ArrayList<>();
+    for (Element element: getElementList()) {
+      if (element.isState()) {
+        states.add(element.asState());
+      }
+    }
+    return states;
+  }
+
+  syn List<Transition> StateMachine.transitions() {
+    List<Transition> transitions = new ArrayList<>();
+    for (Element element: getElementList()) {
+      if (element.isTransition()) {
+        transitions.add(element.asTransition());
+      }
+    }
+    return transitions;
+  }
+}

statemachine/src/main/jastadd/Reachability.jrag

+aspect Reachability {
+  syn Set<State> State.reachable() circular [new HashSet<>()] {
+    Set<State> result = new HashSet<>();
+    for (Transition t : getIncomingList()) {
+      State s = t.getFrom();
+      result.add(s);
+      result.addAll(s.reachable());
+    }
+    return result;
+  }
+
+  syn Set<State> State.inverseReachable() circular [new HashSet<>()] {
+    Set<State> result = new HashSet<>();
+    for (Transition t : getOutgoingList()) {
+      State s = t.getTo();
+      result.add(s);
+      result.addAll(s.inverseReachable());
+    }
+    return result;
+  }
+
+  syn boolean State.hasCycle() = reachable().contains(this);
+
+  syn Set<State> State.SCC() {
+    Set<State> result = new HashSet<>(reachable());
+    result.retainAll(inverseReachable());
+    return result;
+  }
+
+  coll HashSet<Set<State>> StateMachine.SCC() with add root StateMachine;
+  State contributes SCC() when SCC().size() > 0 to StateMachine.SCC();
+}

statemachine/src/main/jastadd/StateMachine.relast

+StateMachine ::= Element*;
+abstract Element ::= <Label:String>;
+State : Element;
+Transition : Element;
+
+rel Transition.From <-> State.Outgoing*;
+rel Transition.To <-> State.Incoming*;
+rel StateMachine.Initial -> State;
+rel StateMachine.Final* -> State;
+
+
+// StateMachine ::= Element*;
+// abstract Element ::= <Label:String>;
+// State : Element;
+// Transition : Element;
+//
+// rel Transition.From <-> State.Outgoing*;
+// rel Transition.To <-> State.Incoming*;
+// rel StateMachine.Initial -> State;
+// rel StateMachine.Final -> State;
+
+// // ======
+//
+// DependencyGraph ::= Node*;
+// Node;
+// rel Node.Dependency* -> Node;
+//
+// // ======
+//
+// rel Node._ -> State;
+//
+// rel DG.NTANAME? -> SM; // Will be generated and set by rel nta
+//
+// syn rel nta DependencyGraph StateMachine.dependencyGraph() {
+//   DG dg = new DG();
+//
+//   Map<State,Node> nodeMap = new HashMap<>();
+//   for (State s) {
+//     Node n = new Node();
+//     //n.setState(s);
+//     dg.addNode(n);
+//     nodeMap.put(s, n);
+//   }
+//
+//   for (Transition t) {
+//     Node to = nodeMap.get(t.getTo());
+//     Node from = nodeMap.get(t.getFrom());
+//
+//     to.addDependency(from);
+//   }
+//   return dg;
+//
+//   syn List<State> StateMachine.cycles() {
+//     List<Node> result = new ArrayList<>();
+//     for (Node n: dependencyGraph().cycles()) {
+//       result.add(n.getState());
+//     }
+//     return result;
+//   }
+// }
+