[wip] gogensig #790

tsingbx · 2024-09-11T06:53:19Z

func mangle name: #757

codecov · 2024-09-11T08:01:57Z

Codecov Report

Attention: Patch coverage is 98.48837% with 13 lines in your changes missing coverage. Please review.

Project coverage is 97.70%. Comparing base (32f41a0) to head (592e979).

Files with missing lines	Patch %	Lines
chore/gogensig/convert/package.go	93.22%	4 Missing and 4 partials ⚠️
chore/gogensig/convert/convert.go	91.66%	2 Missing and 1 partial ⚠️
chore/gogensig/convert/builtin.go	97.95%	1 Missing ⚠️
chore/gogensig/convert/type.go	99.28%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #790      +/-   ##
==========================================
+ Coverage   97.57%   97.70%   +0.12%     
==========================================
  Files          20       31      +11     
  Lines        5165     6025     +860     
==========================================
+ Hits         5040     5887     +847     
- Misses        106      114       +8     
- Partials       19       24       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

luoliwoshang · 2024-09-12T07:39:25Z

chore/gogensig/visitor/genpkg/comments.go

+func NewFuncDocComments(funcName string, goFuncName string) *goast.CommentGroup {
+	txt := "\n//go:linkname " + goFuncName + " " + "C." + funcName
+	comment := goast.Comment{Text: txt}
+	commentGroup := goast.CommentGroup{List: []*goast.Comment{&comment}}
+	return &commentGroup
+}


这里直接使用llgo:link是更推荐的

luoliwoshang · 2024-09-12T07:41:01Z

chore/gogensig/unmarshal/unmarshaller_test.go

+func TestFunc1(t *testing.T) {
+	bytes, err := readJSONFile("./jsons/func1.json")
+	if err != nil {
+		t.Fatal(err)
+	}
+	docVisitors := []visitor.DocVisitor{visitor.NewAstConvert("func1")}
+	p := unmarshal.NewDocFileSetUnmarshaller(docVisitors)
+	err = p.Unmarshal(bytes)
+	if err != nil {
+		t.Fatal(err)
+	}
+}


Mark: 将对这里处理为直接从源代码通过llcppsigfetch的命令行进行转换，而非读取硬编码的json

luoliwoshang · 2024-09-12T07:44:44Z

chore/gogensig/visitor/genpkg/package.go

+	goFuncName := toGoFuncName(funcDecl.Name.Name)
+	p.p.NewFuncDecl(token.NoPos, goFuncName, sig).SetComments(p.p, NewFuncDocComments(funcDecl.Name.Name, goFuncName))
+	return nil


这里Go函数的名字其实应该是接收llcppg.symb.json中的Go Name

{ "mangle": "sqlite3_backup_finish", "c++": "sqlite3_backup_finish(sqlite3_backup *)", "go": "backup_finish" }

luoliwoshang · 2024-09-13T02:49:22Z

chore/llcppg/llcppg.cfg

这个测试文件需要明确标识，并且这个llcppg.cfg和llcppg.symb.json 只应该是gogensig测试的一部分，这个文件在llcppg下并不妥

chore/gogensig/visitor/ast_visitor.go

luoliwoshang · 2024-09-13T03:06:47Z

chore/gogensig/visitor/ast_convert.go

@@ -20,6 +22,15 @@ func NewAstConvert(name string) *AstConvert {
 	return p
 }

+func (p *AstConvert) SetupSymbleTableFile(fileName string) error {


Suggested change

func (p *AstConvert) SetupSymbleTableFile(fileName string) error {

func (p *AstConvert) SetupSymbolTableFile(fileName string) error {

luoliwoshang · 2024-09-13T03:14:13Z

chore/llcppg/llcppg.go


-func llcppsymg(conf []byte) error {
+func llcppsymg(conf []byte, out io.Writer) error {
 	cmd := exec.Command("llcppsymg", "-")
 	cmd.Stdin = bytes.NewReader(conf)
-	cmd.Stdout = os.Stdout
+	cmd.Stdout = out


对llcppg的一些修改还是另外起个Pr来做修改

luoliwoshang · 2024-09-14T10:34:35Z

chore/gogensig/visitor/genpkg/enum_test.go

+	docPath := "./_enumtest/spectrum.json"
+	astConvert := visitor.NewAstConvert("spectrum", docPath)


gogensig 对于llcppsigfetch 的输出是直接通过标准输出输入流来做的，也就是说永远不存在一个llcppsigfetch 的输出的文件路径，对于这个converter来说，即使现在需要临时读取一个文件作为输入，也不应该直接将这个NewAstConvert的签名修改为接受docPath

luoliwoshang · 2024-09-18T03:32:42Z

chore/llcppg/ast/ast.go

conversion 中指明一下还依赖了这个Pr #757 中的mangledname修改吧，commit中就不用存在这个修改

luoliwoshang · 2024-09-18T03:33:01Z

chore/llcppg/llcppg.cfg

这个就不用上传了，如果是gogensig的一部分，应该在测试用例中

luoliwoshang · 2024-09-18T03:47:26Z

chore/gogensig/visitor/testvisitor/enum_test.go

+func TestSpectrum(t *testing.T) {
+	docPath := "./_testinput/_enumtest/spectrum.h"
+	astConvert := visitor.NewAstConvert("spectrum", docPath)


就目前的设计来说，这里应该接受的是一个llcppg.symb.json的路径，不应该会有头文件了

luoliwoshang · 2024-09-18T03:51:35Z

chore/gogensig/visitor/symb/table_test.go

+	"github.com/goplus/llgo/chore/gogensig/visitor/symb"
+)
+
+func TestLookupSymble(t *testing.T) {


Suggested change

func TestLookupSymble(t *testing.T) {

func TestLookupSymbol(t *testing.T) {

luoliwoshang · 2024-09-29T02:21:56Z

chore/gogensig/convert/convert.go

+}
+
+/*
+//TODO


这里的todo最好的姿势是类似如下 TODO(xxxx): .......

llgo/cl/import.go

Lines 296 to 300 in 32f41a0

// TODO(xsw): support generic type

func trecvTypeName(t ast.Expr, indices ...ast.Expr) string {

_ = indices

return t.(*ast.Ident).Name

}

tsingbx force-pushed the gogensignew branch from 21667b5 to f76bd8c Compare September 11, 2024 07:50

luoliwoshang mentioned this pull request Sep 11, 2024

gogensig:basic unmarshal #753

Closed

tsingbx changed the title ~~add unmarshaller~~ [wip] gogensig Sep 11, 2024

tsingbx force-pushed the gogensignew branch 2 times, most recently from d981005 to 6a49f48 Compare September 12, 2024 02:52

luoliwoshang reviewed Sep 12, 2024

View reviewed changes

luoliwoshang reviewed Sep 13, 2024

View reviewed changes

chore/gogensig/visitor/ast_visitor.go Outdated Show resolved Hide resolved

luoliwoshang reviewed Sep 13, 2024

View reviewed changes

tsingbx force-pushed the gogensignew branch 2 times, most recently from 3c0b88b to c15f178 Compare September 13, 2024 12:51

luoliwoshang reviewed Sep 14, 2024

View reviewed changes

luoliwoshang reviewed Sep 18, 2024

View reviewed changes

tsingbx force-pushed the gogensignew branch 9 times, most recently from d7cd226 to f3a8c01 Compare September 25, 2024 01:56

tsingbx closed this Sep 26, 2024

tsingbx reopened this Sep 26, 2024

tsingbx and others added 7 commits September 27, 2024 06:08

fix compile error

654c133

add TestBasicLitFail to fix coverage test

7ecf478

remove unmarshaller.go

5392021

add ast_test to fix coverage test fail

03710ef

gogensig:package func decl error test

87a3285

add TestLookupSymbleError test function

36a919b

modify TestIsVoidType & NewBuiltinTypeMap

622b4c5

tsingbx force-pushed the gogensignew branch from e68c6d0 to 622b4c5 Compare September 27, 2024 03:35

luoliwoshang added 8 commits September 27, 2024 11:46

gogensig:abstract testGenDecl

6fd15d9

gogensig:package enum test

0e6eaec

gogensig:test redef typedef & package write

9229e67

gogensig:remove unuse function

05ef32b

gogensig:remove builtin package

c062e82

gogensig:remove ast_convert & genpkg to converter package

9d43363

gogensig:move testvistor to convert_test

21aea26

gogensig:move util,symb,file to config package

d0611e8

tsingbx closed this Sep 27, 2024

tsingbx reopened this Sep 27, 2024

luoliwoshang and others added 4 commits September 28, 2024 17:03

gogensig:config test

f3aa877

add ast_convert_test

716d930

gogensig:llcppsigfetch test

dffa20f

chore:rename

4e848e9

luoliwoshang reviewed Sep 29, 2024

View reviewed changes

luoliwoshang and others added 5 commits September 29, 2024 12:16

gogensig:test error in type convert

c2f1e8d

gogensig:ident refer test

70d321d

add NewBuiltinTypeMapWithPkgRefS

a59522c

gogensig:clean regen typedef

63451a2

add import _ "unsafe" to expected string

592e979

tsingbx closed this Sep 30, 2024

tsingbx deleted the gogensignew branch October 25, 2024 03:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] gogensig #790

[wip] gogensig #790

tsingbx commented Sep 11, 2024 •

edited

Loading

codecov bot commented Sep 11, 2024 •

edited

Loading

luoliwoshang Sep 12, 2024

luoliwoshang Sep 12, 2024 •

edited

Loading

luoliwoshang Sep 12, 2024

luoliwoshang Sep 13, 2024

luoliwoshang Sep 13, 2024

luoliwoshang Sep 13, 2024

luoliwoshang Sep 14, 2024

luoliwoshang Sep 18, 2024

luoliwoshang Sep 18, 2024

luoliwoshang Sep 18, 2024

luoliwoshang Sep 18, 2024

luoliwoshang Sep 29, 2024

	func (p *AstConvert) SetupSymbleTableFile(fileName string) error {
	func (p *AstConvert) SetupSymbolTableFile(fileName string) error {

		docPath := "./_enumtest/spectrum.json"
		astConvert := visitor.NewAstConvert("spectrum", docPath)

	func TestLookupSymble(t *testing.T) {
	func TestLookupSymbol(t *testing.T) {

+              }
+              /*
+              //TODO

	// TODO(xsw): support generic type
	func trecvTypeName(t ast.Expr, indices ...ast.Expr) string {
	_ = indices
	return t.(*ast.Ident).Name
	}

[wip] gogensig #790

[wip] gogensig #790

Conversation

tsingbx commented Sep 11, 2024 • edited Loading

codecov bot commented Sep 11, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

luoliwoshang Sep 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tsingbx commented Sep 11, 2024 •

edited

Loading

codecov bot commented Sep 11, 2024 •

edited

Loading

luoliwoshang Sep 12, 2024 •

edited

Loading