Skip to content

Commit

Permalink
Update version from 0.0.3 to 0.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
karoliineh committed Jun 13, 2023
1 parent 17986f0 commit 7d9d398
Show file tree
Hide file tree
Showing 33 changed files with 99 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The Integration of the static analyzer [Goblint](https://github.com/goblint/anal

1. Install [Goblint](https://github.com/goblint/analyzer#installing).
2. Download [GobPie plugin](https://nightly.link/goblint/GobPie/workflows/build/master/gobpie-plugin.zip) and unzip the archive.
3. Install the extension into VSCode with `code --install-extension gobpie-0.0.3.vsix`.
3. Install the extension into VSCode with `code --install-extension gobpie-0.0.4.vsix`.

When installing goblint locally (as recommended), **make sure that GobPie can find the correct version Goblint**.
This can be done in two ways:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>goblint</groupId>
<artifactId>gobpie</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>0.0.4-SNAPSHOT</version>
<dependencies>

<!-- lsp4j DAP -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
* Implements the core logic of abstract debugging with the lsp4j DAP interface.
*
* @author Juhan Oskar Hennoste
* @since 0.0.4
*/
public class AbstractDebuggingServer implements IDebugProtocolServer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* Responsible for exposing the DAP-based abstract debugging server over a UNIX domain socket.
*
* @author Juhan Oskar Hennoste
* @since 0.0.4
*/
public class AbstractDebuggingServerLauncher {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/BreakpointInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
import javax.annotation.Nullable;
import java.util.List;

/**
* @since 0.0.4
*/

public record BreakpointInfo(
CFGNodeInfo cfgNode,
@Nullable ConditionalExpression condition,
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/CFGEdgeInfo.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package abstractdebugging;

/**
* @since 0.0.4
*/

public class CFGEdgeInfo extends EdgeInfo {

private final String statementDisplayString;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/CFGNodeInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import api.messages.GoblintLocation;

/**
* @since 0.0.4
*/

public record CFGNodeInfo(
String cfgNodeId,
GoblintLocation location
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/ConditionalExpression.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

import java.util.Locale;

/**
* @since 0.0.4
*/

public record ConditionalExpression(boolean must, String expression) {

private static final String EXPLICIT_MODE_PREFIX = "\\";
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/EdgeInfo.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package abstractdebugging;

/**
* @since 0.0.4
*/

public class EdgeInfo {

private final String nodeId;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/FunctionCallEdgeInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import java.util.List;

/**
* @since 0.0.4
*/

public class FunctionCallEdgeInfo extends EdgeInfo {

private final String function;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/abstractdebugging/IllegalStepException.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/**
* Thrown when the requested step is invalid.
* Usually this occurs because the target node is ambiguous for some thread.
*
* @since 0.0.4
*/
public class IllegalStepException extends Exception {

Expand Down
10 changes: 6 additions & 4 deletions src/main/java/abstractdebugging/NodeInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@

/**
* Represents information about an ARG node.
* @param nodeId The ARG node id assigned by Goblint
*
* @param nodeId The ARG node id assigned by Goblint
* @param cfgNodeId The corresponding CFG node id assigned by Goblint
* @param contextId The corresponding context id assigned by Goblint
* @param pathId The corresponding path id assigned by Goblint
* @param location Location of node in source code
* @param function Name of function that contains this node
* @param pathId The corresponding path id assigned by Goblint
* @param location Location of node in source code
* @param function Name of function that contains this node
* @since 0.0.4
*/
public record NodeInfo(
String nodeId,
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/abstractdebugging/RequestFailedException.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
/**
* Exception thrown by {@link AbstractDebuggingServer} {@link GoblintService} wrapper methods
* when a syntactically valid request to the Goblint server fails for a known/expected reason.
*
* @since 0.0.4
*/
public class RequestFailedException extends RuntimeException {

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/abstractdebugging/ResultsService.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
/**
* Synchronous convenience methods for working with GoblintService for abstract debugging.
* In the future this can be converted to an interface and mocked for testing purposes.
*
* @since 0.0.4
*/
public class ResultsService {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/abstractdebugging/StackFrameState.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import javax.annotation.Nullable;

/**
* @since 0.0.4
*/

public class StackFrameState {

private NodeInfo node;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/abstractdebugging/ThreadState.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* <p>
* A note about terminology: The topmost frame is the frame that was added by the latest function call and contains the current location of the thread.
* It is located at index 0 in the list of frames.
*
* @author Juhan Oskar Hennoste
* @since 0.0.4
*/
public class ThreadState {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/ARGStateParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class ARGStateParams {

private String node;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/CFGLookupParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class CFGLookupParams {

private String node;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/EvalIntQueryParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class EvalIntQueryParams {

private String node;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/api/messages/EvalIntResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import javax.annotation.Nullable;
import java.math.BigInteger;

/**
* @since 0.0.4
*/
public class EvalIntResult {

private JsonElement raw;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/EvalQueryParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class EvalQueryParams {

private String node;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/GlobalStateParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class GlobalStateParams {

private Long vid;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/GoblintARGLookupResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

import java.util.List;

/**
* @since 0.0.4
*/

public class GoblintARGLookupResult {

private String node;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/api/messages/GoblintARGResult.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package api.messages;

/**
* The Class GoblintCFGResult.
* The Class GoblintARGResult.
* <p>
* Corresponding object to the Goblint cfg request response results in JSON.
*
* @author Karoliine Holter
* @since 0.0.3
* @author Juhan Oskar Hennoste
* @since 0.0.4
*/

public class GoblintARGResult {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/GoblintCFGLookupResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import abstractdebugging.CFGNodeInfo;

/**
* @since 0.0.4
*/

public class GoblintCFGLookupResult {

private String node;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/api/messages/GoblintLocation.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Goblint CIL location.
*
* @author Juhan Oskar Hennoste
* @since 0.0.3
* @since 0.0.4
*/
public class GoblintLocation {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/GoblintVarinfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import javax.annotation.Nullable;

/**
* @since 0.0.4
*/

public class GoblintVarinfo {

private long vid;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/LookupParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class LookupParams {

private String node;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/api/messages/NodeParams.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package api.messages;

/**
* @since 0.0.4
*/

public class NodeParams {

private String nid;
Expand Down
2 changes: 1 addition & 1 deletion vscode/installGobPie.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mvn clean -f "../../GobPie/pom.xml"
mvn install -f "../../GobPie/pom.xml"
echo y | vsce package
code --install-extension gobpie-0.0.3.vsix
code --install-extension gobpie-0.0.4.vsix
2 changes: 1 addition & 1 deletion vscode/install_and_test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Load environment variables from .env
export $(grep -v '^#' .env | xargs)

code --install-extension gobpie-0.0.3.vsix
code --install-extension gobpie-0.0.4.vsix
code $GOBPIE_TEST_PROJECT
4 changes: 2 additions & 2 deletions vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "The interactive Goblint analyzer extension",
"author": "Karoliine Holter",
"license": "MIT",
"version": "0.0.3",
"version": "0.0.4",
"repository": {
"type": "git",
"url": "https://github.com/goblint/GobPie.git"
Expand Down Expand Up @@ -94,7 +94,7 @@
]
},
"scripts": {
"vscode:prepublish": "shx cp ../target/gobpie-0.0.3-SNAPSHOT.jar gobpie-0.0.3-SNAPSHOT.jar && npm run package",
"vscode:prepublish": "shx cp ../target/gobpie-0.0.4-SNAPSHOT.jar gobpie-0.0.4-SNAPSHOT.jar && npm run package",
"webpack": "webpack --mode development",
"webpack-dev": "webpack --mode development --watch",
"package": "webpack --mode production --devtool hidden-source-map",
Expand Down
2 changes: 1 addition & 1 deletion vscode/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function activate(context: ExtensionContext) {
const adbSocketPath = `gobpie_adb_${crypto.randomBytes(6).toString('base64url')}.sock`

const script = 'java';
const args = ['-jar', context.asAbsolutePath('gobpie-0.0.3-SNAPSHOT.jar'), adbSocketPath];
const args = ['-jar', context.asAbsolutePath('gobpie-0.0.4-SNAPSHOT.jar'), adbSocketPath];

// Use this for communicating on stdio
let serverOptions: ServerOptions = {
Expand Down

0 comments on commit 7d9d398

Please sign in to comment.