Changeset 6e2b04e for tools

Timestamp:

Jun 8, 2022, 4:23:41 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

7f0ac12, db7a3ad

Parents:

55422cf (diff), 720f2fe2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tools

Files:

• cfa.nanorc (modified) (1 diff)
• jenkins/setup.sh.in (modified) (2 diffs)

tools/cfa.nanorc

@@ -10 +10 @@
 color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
 color green "\<(float|double|bool|char|int|short|long|enum|void|auto)\>"
-color green "\<(static|const|extern|(un)?signed|inline)\>" "\<(sizeof)\>"
+color green "\<(static|const|extern|(un)?signed|inline|sizeof|vtable)\>"
 color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 
 # Declarations
 color brightgreen "\<(struct|union|typedef|trait|coroutine|generator)\>"
-color brightgreen "\<(monitor|thread|with)\>"
+color brightgreen "\<(monitor|thread|with|exception)\>"
 
 # Control Flow Structures

tools/jenkins/setup.sh.in

@@ -29 +29 @@
 function getrunpath()
 {
-        local elfout=$(readelf -d $1 | grep "RUNPATH")
+        local elfout=$(readelf -d $1 | grep -E "RPATH|RUNPATH")
         regex='\[/([[:alpha:][:digit:]@/_.-]+)\]'
         if [[ $elfout =~ $regex ]]; then
@@ -43 +43 @@
 {
         local deps=$(ldd $1)
+        retlcldeps=()
         retsysdeps=()
-        retlcldeps=()
         while IFS= read -r line; do
-                regex1='/([[:alpha:][:digit:]@/_.-]+)'
-                regex2='(libcfa[[:alpha:][:digit:].]+) => not found'
+                regex1='(libcfa[[:alpha:][:digit:].]+)'
+                regex2='/([[:alpha:][:digit:]@/_.-]+)'
                 regex3='linux-vdso.so.1|linux-gate.so.1'
                 if [[ $line =~ $regex1 ]]; then
+                        retlcldeps+=(${BASH_REMATCH[1]})
+                elif [[ $line =~ $regex2 ]]; then
                         retsysdeps+=(${BASH_REMATCH[1]})
-                elif [[ $line =~ $regex2 ]]; then
-                        retlcldeps+=(${BASH_REMATCH[1]})
                 elif [[ $line =~ $regex3 ]]; then
                         # echo "ignoring '$line}': intrinsic"