Commit 91c5197

committed

Merge pull request halfrost#53 from kadefor/patch-1

精简代码

2 parents 5e6111e + 8075f06 commit 91c5197Copy full SHA for 91c5197

File tree

+23

-46

lines changed

+23

-46

lines changed

Lines changed: 11 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,36 +16,24 @@ type ListNode = structures.ListNode`
`16`	`16`	`*/`
`17`	`17`
`18`	`18`	`func addTwoNumbers(l1 ListNode, l2 ListNode) *ListNode {`
`19`		`- if l1 == nil \|\| l2 == nil {`
`20`		`- return nil`
`21`		`- }`
`22`		`- head := &ListNode{Val: 0, Next: nil}`
`23`		`- current := head`
`24`		`- carry := 0`
`25`		`- for l1 != nil \|\| l2 != nil {`
`26`		`- var x, y int`
	`19`	`+ head := &ListNode{Val: 0}`
	`20`	`+ n1, n2, carry, current := 0, 0, 0, head`
	`21`	`+ for l1 != nil \|\| l2 != nil \|\| carry != 0 {`
`27`	`22`	`if l1 == nil {`
`28`		`- x = 0`
	`23`	`+ n1 = 0`
`29`	`24`	`} else {`
`30`		`- x = l1.Val`
	`25`	`+ n1 = l1.Val`
	`26`	`+ l1 = l1.Next`
`31`	`27`	`}`
`32`	`28`	`if l2 == nil {`
`33`		`- y = 0`
	`29`	`+ n2 = 0`
`34`	`30`	`} else {`
`35`		`- y = l2.Val`
`36`		`- }`
`37`		`- current.Next = &ListNode{Val: (x + y + carry) % 10, Next: nil}`
`38`		`- current = current.Next`
`39`		`- carry = (x + y + carry) / 10`
`40`		`- if l1 != nil {`
`41`		`- l1 = l1.Next`
`42`		`- }`
`43`		`- if l2 != nil {`
	`31`	`+ n2 = l2.Val`
`44`	`32`	`l2 = l2.Next`
`45`	`33`	`}`
`46`		`- }`
`47`		`- ifcarry>0 {`
`48`		`- current.Next = &ListNode{Val: carry%10, Next: nil}`
	`34`	`+ current.Next=&ListNode{Val: (n1+n2+carry) %10}`
	`35`	`+ current=current.Next`
	`36`	`+ carry = (n1+n2+carry) /10`
`49`	`37`	`}`
`50`	`38`	`return head.Next`
`51`	`39`	`}`

Lines changed: 12 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,37 +51,26 @@ package leetcode`
`51`	`51`	`* Next *ListNode`
`52`	`52`	`* }`
`53`	`53`	`*/`
	`54`	`+`
`54`	`55`	`func addTwoNumbers(l1 ListNode, l2 ListNode) *ListNode {`
`55`		`- if l1 == nil \|\| l2 == nil {`
`56`		`- return nil`
`57`		`- }`
`58`		`- head := &ListNode{Val: 0, Next: nil}`
`59`		`- current := head`
`60`		`- carry := 0`
`61`		`- for l1 != nil \|\| l2 != nil {`
`62`		`- var x, y int`
	`56`	`+ head := &ListNode{Val: 0}`
	`57`	`+ n1, n2, carry, current := 0, 0, 0, head`
	`58`	`+ for l1 != nil \|\| l2 != nil \|\| carry != 0 {`
`63`	`59`	`if l1 == nil {`
`64`		`- x = 0`
	`60`	`+ n1 = 0`
`65`	`61`	`} else {`
`66`		`- x = l1.Val`
	`62`	`+ n1 = l1.Val`
	`63`	`+ l1 = l1.Next`
`67`	`64`	`}`
`68`	`65`	`if l2 == nil {`
`69`		`- y = 0`
	`66`	`+ n2 = 0`
`70`	`67`	`} else {`
`71`		`- y = l2.Val`
`72`		`- }`
`73`		`- current.Next = &ListNode{Val: (x + y + carry) % 10, Next: nil}`
`74`		`- current = current.Next`
`75`		`- carry = (x + y + carry) / 10`
`76`		`- if l1 != nil {`
`77`		`- l1 = l1.Next`
`78`		`- }`
`79`		`- if l2 != nil {`
	`68`	`+ n2 = l2.Val`
`80`	`69`	`l2 = l2.Next`
`81`	`70`	`}`
`82`		`- }`
`83`		`- if carry > 0 {`
`84`		`- current.Next = &ListNode{Val: carry % 10, Next: nil}`
	`71`	`+ current.Next = &ListNode{Val: (n1 + n2 + carry) % 10}`
	`72`	`+ current = current.Next`
	`73`	`+ carry = (n1 + n2 + carry) / 10`
`85`	`74`	`}`
`86`	`75`	`return head.Next`
`87`	`76`	`}`

Comments

(0)