Skip to content

Commit

Permalink
More XML formatting and GH Actions fix (#61)
Browse files Browse the repository at this point in the history 
1. XML formatting was not recursing into subdirectories. Fixed.
2. GitHub Actions CI config was not maintaining the correct working directories. Fixed.
  • Loading branch information
@khatchad
khatchad authored Jun 23, 2023
1 parent 6c10952 commit 6c8e096
Show file tree
Hide file tree
Showing 19 changed files with 591 additions and 1,168 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/continuous-integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,23 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Checkout wala/IDE sources.
uses: actions/checkout@v3.5.2
with:
repository: wala/IDE
# fetch-depth: 50
path: ./IDE
run: git clone --depth=1 https://github.com/wala/IDE ${{ runner.temp }}/IDE
- name: Checkout juliandolby/jython3 sources.
uses: actions/checkout@v3.5.2
with:
repository: juliandolby/jython3
path: ./jython3
run: git clone --depth=1 https://github.com/juliandolby/jython3.git ${{ runner.temp }}/jython3
- name: Install Jython3.
run: |
cd ./jython3
pushd ${{ runner.temp }}/jython3
ant
cd dist
pushd dist
mvn install:install-file -Dfile=./jython-dev.jar -DgroupId="org.python" -DartifactId="jython3" -Dversion="0.0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom=true
popd
popd
shell: bash
- name: Install IDE.
run: |
cd ./IDE/com.ibm.wala.cast.lsp
pushd ${{ runner.temp }}/IDE/com.ibm.wala.cast.lsp
mvn clean install -B -q -DskipTests
popd
- name: Check formatting with spotless.
run: mvn spotless:check -B
- name: Build with Maven
Expand Down
42 changes: 14 additions & 28 deletions com.ibm.wala.cast.python.jython/data/functools.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,29 @@
<summary-spec>
<classloader name="PythonLoader">
<class name="functools" allocatable="true">
<method name="import"
static="true"
descriptor="()Lfunctools;">
<new def="x" class="Lfunctools"/>
<method name="import" static="true" descriptor="()Lfunctools;">
<new def="x" class="Lfunctools" />

<new def="reduce" class="Lfunctools/functions/reduce"/>
<putfield class="LRoot"
field="reduce"
fieldType="LRoot"
ref="x"
value="reduce"/>
<new def="reduce" class="Lfunctools/functions/reduce" />
<putfield class="LRoot" field="reduce" fieldType="LRoot" ref="x" value="reduce" />

<return value="x"/>
<return value="x" />
</method>
</class>

<package name="functools/functions">

<class name="reduce" allocatable="true">
<method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self lambda data">
<constant name="l" type="int" value="0"/>
<aaload ref="data" def="v1" type="LRoot" index="l"/>
<constant name="r" type="int" value="1"/>
<aaload ref="data" def="v2" type="LRoot" index="r"/>
<call class="LRoot"
name="do"
descriptor="()LRoot;"
type="virtual"
arg0="lambda"
arg1="v1"
arg2="v2"
numArgs="3"
def="v"/>
<return value="v"/>
</method>
<method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self lambda data">
<constant name="l" type="int" value="0" />
<aaload ref="data" def="v1" type="LRoot" index="l" />
<constant name="r" type="int" value="1" />
<aaload ref="data" def="v2" type="LRoot" index="r" />
<call class="LRoot" name="do" descriptor="()LRoot;" type="virtual" arg0="lambda" arg1="v1" arg2="v2" numArgs="3" def="v" />
<return value="v" />
</method>
</class>

</package>
</classloader>
</summary-spec>
14 changes: 4 additions & 10 deletions com.ibm.wala.cast.python.jython/data/numpy_turtle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@
<summary-spec>
<classloader name="PythonLoader">
<class name="numpy" allocatable="true">
<method name="import"
static="true"
descriptor="()Lnumpy;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Lnumpy;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
</classloader>
Expand Down
41 changes: 15 additions & 26 deletions com.ibm.wala.cast.python.jython/data/pandas.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,33 @@
<summary-spec>
<classloader name="PythonLoader">
<class name="pandas" allocatable="true">
<method name="import"
static="true"
descriptor="()Lpandas;">
<new def="x" class="Lpandas"/>
<method name="import" static="true" descriptor="()Lpandas;">
<new def="x" class="Lpandas" />

<new def="read_excel" class="Lpandas/functions/read_excel"/>
<putfield class="LRoot"
field="read_excel"
fieldType="LRoot"
ref="x"
value="read_excel"/>
<new def="read_excel" class="Lpandas/functions/read_excel" />
<putfield class="LRoot" field="read_excel" fieldType="LRoot" ref="x" value="read_excel" />

<new def="merge" class="Lpandas/functions/merge"/>
<putfield class="LRoot"
field="merge"
fieldType="LRoot"
ref="x"
value="merge"/>
<new def="merge" class="Lpandas/functions/merge" />
<putfield class="LRoot" field="merge" fieldType="LRoot" ref="x" value="merge" />

<return value="x"/>
<return value="x" />
</method>
</class>

<package name="pandas/functions">

<class name="read_excel" allocatable="true">
<method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self file sheet">
<new def="v" class="Lobject"/>
<return value="v"/>
</method>
<method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self file sheet">
<new def="v" class="Lobject" />
<return value="v" />
</method>
</class>

<class name="merge" allocatable="true">
<method name="do" descriptor="()LRoot;" numArgs="5"
paramNames="self left right on how">
<return value="left"/>
<return value="right"/>
</method>
<method name="do" descriptor="()LRoot;" numArgs="5" paramNames="self left right on how">
<return value="left" />
<return value="right" />
</method>
</class>
</package>
</classloader>
Expand Down
162 changes: 48 additions & 114 deletions com.ibm.wala.cast.python.jython/data/turtles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,146 +4,80 @@
<summary-spec>
<classloader name="PythonLoader">
<class name="numpy" allocatable="true">
<method name="import"
static="true"
descriptor="()Lnumpy;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Lnumpy;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="sklearn" allocatable="true">
<method name="import"
static="true"
descriptor="()Lsklearn;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Lsklearn;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="pandas" allocatable="true">
<method name="import"
static="true"
descriptor="()Lpandas;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Lpandas;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="patsy" allocatable="true">
<method name="import"
static="true"
descriptor="()Lpatsy;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Lpatsy;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="seaborn" allocatable="true">
<method name="import"
static="true"
descriptor="()Lseaborn;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Lseaborn;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="statsmodels" allocatable="true">
<method name="import"
static="true"
descriptor="()Lstatsmodels;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<class name="statsmodels" allocatable="true">
<method name="import" static="true" descriptor="()Lstatsmodels;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="scipy" allocatable="true">
<method name="import"
static="true"
descriptor="()Lscipy;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<class name="scipy" allocatable="true">
<method name="import" static="true" descriptor="()Lscipy;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="matplotlib" allocatable="true">
<method name="import"
static="true"
descriptor="()Lmatplotlib;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<class name="matplotlib" allocatable="true">
<method name="import" static="true" descriptor="()Lmatplotlib;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="IPython" allocatable="true">
<method name="import"
static="true"
descriptor="()LIPython;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()LIPython;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="mpl_toolkits" allocatable="true">
<method name="import"
static="true"
descriptor="()Lmpl_toolkits;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<class name="mpl_toolkits" allocatable="true">
<method name="import" static="true" descriptor="()Lmpl_toolkits;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
<class name="tensorflow" allocatable="true">
<method name="import"
static="true"
descriptor="()Ltensorflow;">
<new def="x" class="Lturtle"/>
<putfield class="Lturtle"
field="any"
fieldType="LRoot"
ref="x"
value="x"/>
<return value="x"/>
<method name="import" static="true" descriptor="()Ltensorflow;">
<new def="x" class="Lturtle" />
<putfield class="Lturtle" field="any" fieldType="LRoot" ref="x" value="x" />
<return value="x" />
</method>
</class>
</classloader>
Expand Down
Loading

0 comments on commit 6c8e096

Please sign in to comment.