Attempt at adding alda-code function to alda-lisp

Author: daveyarwood

client/model/lisp.go

@@ -8,6 +8,24 @@ import (
 
 	"alda.io/client/json"
 	log "alda.io/client/logging"
+
+	// FIXME: This doesn't work because the `parser` package depends on the
+	// `model` package, so attempting to import the `parser` package _from_ the
+	// `model` package results in a cyclic import error:
+	//
+	// package alda.io/client
+	//         imports alda.io/client/cmd
+	//         imports alda.io/client/code-generator
+	//         imports alda.io/client/model
+	//         imports alda.io/client/parser
+	//         imports alda.io/client/model: import cycle not allowed
+	// package alda.io/client
+	//         imports alda.io/client/cmd
+	//         imports alda.io/client/code-generator
+	//         imports alda.io/client/model
+	//         imports alda.io/client/parser
+	//         imports alda.io/client/model: import cycle not allowed
+	"alda.io/client/parser"
 )
 
 // Alda includes a minimal Lisp implementation as a subset of the language, in
@@ -1005,7 +1023,7 @@ func init() {
 	for marking := range DynamicVolumes {
 		defattribute([]string{marking},
 			attributeFunctionSignature{
-				argumentTypes: []LispForm{},
+				argumentTypes:  []LispForm{},
 				implementation: dynamicImplementation(marking),
 			},
 		)
@@ -1315,6 +1333,27 @@ func init() {
 			},
 		},
 	)
+
+	defn("alda-code",
+		FunctionSignature{
+			ArgumentTypes: []LispForm{LispString{}},
+			Implementation: func(args ...LispForm) (LispForm, error) {
+				stringLiteral := args[0].(LispString)
+
+				// FIXME: This doesn't work because of a cyclic import error. See
+				// comment at the top of this file for more details.
+				scoreUpdates, err := parser.ParseString(stringLiteral.Value)
+				if err != nil {
+					return nil, &AldaSourceError{
+						Context: stringLiteral.SourceContext,
+						Err:     err,
+					}
+				}
+
+				return EventSequence{Events: scoreUpdates}, nil
+			},
+		},
+	)
 }
 
 // LispNil is the value nil.

client/model/notes_test.go

@@ -485,5 +485,23 @@ func TestNotes(t *testing.T) {
 				expectMidiNoteNumbers(67),
 			},
 		},
+		scoreUpdateTestCase{
+			label: "alda-code notes",
+			updates: []ScoreUpdate{
+				PartDeclaration{Names: []string{"piano"}},
+				LispList{Elements: []LispForm{
+					LispSymbol{Name: "tempo"},
+					LispNumber{Value: 120},
+				}},
+				LispList{Elements: []LispForm{
+					LispSymbol{Name: "alda-code"},
+					LispString{Value: "c+2 f+ a"},
+				}},
+			},
+			expectations: []scoreUpdateExpectation{
+				expectNoteDurations(1000, 1000, 1000),
+				expectMidiNoteNumbers(61, 65, 68),
+			},
+		},
 	)
 }