oec/uncrust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more general regex and handle stdout and stderr

Browse Source
This commit is contained in:
Özgür Kesim 2024-12-09 13:40:43 +01:00
parent ba4c34b592
commit 26f349fd57
Signed by: oec
GPG Key ID: F136A7F922D018D7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
uncrust.go
View File

@ -20,7 +20,7 @@ var (
fl_lang = flag.String("l", "C", "Language") fl_lang = flag.String("l", "C", "Language")
fl_verbose = flag.Bool("v", false, "Verbosity on") fl_verbose = flag.Bool("v", false, "Verbosity on")
pos_rx = regexp.MustCompile(`File: stdin, orig line is ([\d]+), orig col is ([\d])`) pos_rx = regexp.MustCompile(`.* orig line is ([\d]+), orig col is ([\d])`)
) )
func main() { func main() {
@ -61,6 +61,7 @@ func main() {
if e = cmd.Run(); e != nil { if e = cmd.Run(); e != nil {
if _, ok := e.(*exec.ExitError); ok { if _, ok := e.(*exec.ExitError); ok {
str := stderr.String() str := stderr.String()
str += "\n" + stdout.String()
if len(samfile) != 0 { if len(samfile) != 0 {
str = strings.ReplaceAll(str, "stdin, open_line is ", samfile+":") str = strings.ReplaceAll(str, "stdin, open_line is ", samfile+":")
str = pos_rx.ReplaceAllString(str, fmt.Sprintf("%s:$1:#$2", samfile)) str = pos_rx.ReplaceAllString(str, fmt.Sprintf("%s:$1:#$2", samfile))