Improvements

.github/workflows/go.yml

@@ -3,25 +3,19 @@ on: [push]
 jobs:
 
   build:
-    name: Build
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.13', '1.14' ]
+        go-version: [ '1.20', '1.21' ]
 
     steps:
-    - name: Set up Go ${{ matrix.go }}
-      uses: actions/setup-go@v1
-      with:
-        go-version: ${{ matrix.go }}
-      id: go
-
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
+    - name: Set up Go ${{ matrix.go-version }}
+      uses: actions/setup-go@v4
+      with:
+        go-version: ${{ matrix.go-version }}
 
     - name: Test
       run: go test -v .

go.mod

@@ -0,0 +1,3 @@
+module github.com/luxifer/ical
+
+go 1.20

lex.go

@@ -61,15 +61,6 @@ const (
 	itemEndVAlarm
 )
 
-var key = map[string]itemType{
-	"BEGIN:VCALENDAR": itemBeginVCalendar,
-	"END:VCALENDAR":   itemEndVCalendar,
-	"BEGIN:VEVENT":    itemBeginVEvent,
-	"END:VEVENT":      itemEndVEvent,
-	"BEGIN:VALARM":    itemBeginVAlarm,
-	"END:VALARM":      itemEndVAlarm,
-}
-
 const eof = -1
 
 // stateFn represents the state of the scanner as a function that returns the next state.

lex_test.go

@@ -1,12 +1,12 @@
 package ical
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 )
 
 func TestLex(t *testing.T) {
-	ical, _ := ioutil.ReadFile("fixtures/example.ics")
+	ical, _ := os.ReadFile("fixtures/example.ics")
 	lexer := lex(string(ical))
 
 	for {

parse.go

@@ -144,16 +144,6 @@ func (p *parser) backup() {
 	p.peekCount++
 }
 
-// peek returns but does not consume the next token.
-func (p *parser) peek() item {
-	if p.peekCount > 0 {
-		return p.token[p.peekCount-1]
-	}
-	p.peekCount = 1
-	p.token[0] = p.lex.nextItem()
-	return p.token[0]
-}
-
 // enterScope switch scope between Calendar, Event and Alarm
 func (p *parser) enterScope() {
 	p.scope++

parse_test.go

@@ -22,6 +22,20 @@ func TestParse(t *testing.T) {
 	}
 }
 
+func BenchmarkParse(b *testing.B) {
+	for _, filename := range calendarList {
+		file, _ := os.Open(filename)
+		info, _ := file.Stat()
+
+		b.Run(filename, func(b *testing.B) {
+			b.SetBytes(info.Size())
+			for n := 0; n < b.N; n++ {
+				_, _ = Parse(file, nil)
+			}
+		})
+	}
+}
+
 func Test_parseDate(t *testing.T) {
 	loc, _ := time.LoadLocation("America/New_York")
 	type args struct {
@@ -39,7 +53,7 @@ func Test_parseDate(t *testing.T) {
 				prop: &Property{
 					Name: "DTSTART",
 					Params: map[string]*Param{
-						"VALUE": &Param{
+						"VALUE": {
 							Values: []string{"DATE"},
 						},
 					},
@@ -55,7 +69,7 @@ func Test_parseDate(t *testing.T) {
 				prop: &Property{
 					Name: "DTSTART",
 					Params: map[string]*Param{
-						"TZID": &Param{
+						"TZID": {
 							Values: []string{"America/New_York"},
 						},
 					},
@@ -93,7 +107,7 @@ func Test_parseDate(t *testing.T) {
 				prop: &Property{
 					Name: "DSTART",
 					Params: map[string]*Param{
-						"VALUE": &Param{
+						"VALUE": {
 							Values: []string{"DATE-TIME"},
 						},
 					},
@@ -109,7 +123,7 @@ func Test_parseDate(t *testing.T) {
 				prop: &Property{
 					Name: "DTSTART",
 					Params: map[string]*Param{
-						"TZID": &Param{
+						"TZID": {
 							Values: []string{"Z"},
 						},
 					},