More frameworks

Makefile

@@ -4,6 +4,10 @@ generate:
 	$(GOEXE) generate ./...
 .PHONY: generate
 
+test:
+	$(GOEXE) test ./...
+.PHONY: test
+
 clobber:
 	$(GOEXE) run ./generate/tools/clobbergen.go ./macos
 .PHONY: clobber

generate/class.go

@@ -51,6 +51,10 @@ func (db *Generator) ToClassGen(sym Symbol) *codegen.Class {
 		}
 	}
 	if st.Interface.SuperName != "" {
+		// MPSGraphObject not documented, but we should assume its at least similar to NSObject
+		if st.Interface.SuperName == "MPSGraphObject" {
+			st.Interface.SuperName = "NSObject"
+		}
 		if st.Interface.SuperName == "NSObject" {
 			classGen.Super = &codegen.Class{
 				Type: typing.Object,

generate/codegen/aliasinfo.go

@@ -15,7 +15,15 @@ type AliasInfo struct {
 
 // IsString return if is a string type Enum
 func (e *AliasInfo) IsString() bool {
-	_, ok := e.Type.(*typing.StringType)
+	t := e.Type
+	for {
+		at, ok := t.(*typing.AliasType)
+		if !ok {
+			break
+		}
+		t = at.Type
+	}
+	_, ok := t.(*typing.StringType)
 	return ok
 }
 

generate/codegen/gen_method.go

@@ -36,8 +36,8 @@ func (m *Method) needRelease() bool {
 	case *typing.PrimitiveType, *typing.StringType:
 		return false
 	}
-	return strings.HasPrefix(m.Name, "new") || !strings.HasPrefix(m.Name, "init") && strings.HasPrefix(m.Name, "Initial") ||
-		strings.HasPrefix(m.Name, "copy") || strings.HasPrefix(m.Name, "mutableCopy")
+	//!strings.HasPrefix(m.Name, "init") && strings.HasPrefix(m.Name, "Initial")
+	return m.Name == "new" || m.Name == "copy" || m.Name == "mutableCopy"
 }
 
 // Selector return full Objc function name

generate/codegen/gen_property.go

@@ -1,6 +1,8 @@
 package codegen
 
 import (
+	"strings"
+
 	"github.com/progrium/macdriver/generate/typing"
 	"github.com/progrium/macdriver/internal/stringx"
 )
@@ -49,11 +51,11 @@ func (p *Property) getter() *Method {
 func (p *Property) setter() *Method {
 	name := "set" + stringx.Capitalize(p.Name)
 	if p.SetterName != "" {
-		name = p.SetterName
+		name = strings.TrimSuffix(p.SetterName, ":")
 	}
 	goName := "set" + stringx.Capitalize(p.GoName)
 	if p.SetterName != "" {
-		goName = p.SetterName
+		goName = strings.TrimSuffix(p.SetterName, ":")
 	}
 	return &Method{
 		Name:         name,

generate/codegen/gen_protocol.go

@@ -140,6 +140,10 @@ func (p *Protocol) writeProtocolInterface(w *CodeWriter) {
 		}
 	}
 	for _, m := range p.allMethods() {
+		// don't support class methods on protocols yet
+		if m.ClassMethod {
+			continue
+		}
 		if !m.Required {
 			w.WriteLine("// optional")
 		} else {
@@ -176,6 +180,10 @@ func (p *Protocol) writeDelegateStruct(w *CodeWriter) {
 
 	receiver := "di"
 	for _, m := range p.allMethods() {
+		// don't support class methods on protocols yet
+		if m.ClassMethod {
+			continue
+		}
 		if !m.Required {
 			w.WriteLine(fmt.Sprintf("func (%s *%s) Has%s() bool {", receiver, implStructName, m.ProtocolGoFuncName()))
 			w.WriteLine(fmt.Sprintf("\t return %s._%s != nil", receiver, m.ProtocolGoFuncName()))
@@ -235,6 +243,10 @@ func (p *Protocol) writeProtocolWrapperStruct(w *CodeWriter) {
 	w.WriteLine("}")
 
 	for _, m := range p.allMethods() {
+		// don't support class methods on protocols yet
+		if m.ClassMethod {
+			continue
+		}
 		w.WriteLine("")
 		if !m.Required {
 			receiver := strings.ToLower(typeName[0:1] + "_")

generate/codegen/modulewriter.go

@@ -34,6 +34,14 @@ func (m *ModuleWriter) WriteCode() {
 		// get "cannot find protocol declaration" with protocol imports
 		return
 	}
+	if m.Module.Package == "coremediaio" {
+		// get "cannot find protocol declaration" with protocol imports
+		return
+	}
+	if m.Module.Package == "fileprovider" {
+		// get "cannot find protocol declaration" with protocol imports
+		return
+	}
 	m.WriteProtocolsImportCode()
 }
 

generate/declparse/declparse_test.go

@@ -15,6 +15,20 @@ var tests = []struct {
 		},
 	},
 
+	{
+		ParseOnly: true,
+		s:         `typedef enum SCPreferencesNotification : uint32_t SCPreferencesNotification;`,
+		n: &Statement{
+			Enum: &EnumDecl{
+				Name: "SCPreferencesNotification",
+				Type: TypeInfo{
+					Name: "uint32_t",
+				},
+			},
+			Typedef: "SCPreferencesNotification",
+		},
+	},
+
 	{
 		ParseOnly: true,
 		// notice eNum is "enum"

generate/declparse/parser_enum.go

@@ -30,7 +30,8 @@ func parseEnum(p *Parser) (next stateFn, node Node, err error) {
 	}
 
 	if err := p.expectToken(lexer.LCURLY); err != nil {
-		return nil, nil, err
+		p.tb.Unscan()
+		return nil, decl, nil
 	}
 
 	if err = p.expectToken(lexer.VARARG); err != nil {

generate/generator.go

@@ -156,7 +156,7 @@ func (db *Generator) ResolveTypeAlias(typeName string) (declparse.TypeInfo, bool
 
 func (db *Generator) TypeFromSymbolName(name string) typing.Type {
 	// hardcoded for now
-	if db.Platform == "macos" && strings.HasPrefix(name, "UI") {
+	if db.Platform == "macos" && strings.HasPrefix(name, "UI") && !strings.HasPrefix(name, "UInt") {
 		name = "NS" + strings.TrimPrefix(name, "UI")
 	}
 	s := db.FindTypeSymbol(name)

generate/modules/enums/macos/mediaplayer

@@ -0,0 +1,124 @@
+MPChangeLanguageOptionSettingNone 0
+MPChangeLanguageOptionSettingNowPlayingItemOnly 1
+MPChangeLanguageOptionSettingPermanent 2
+MPErrorCancelled 6
+MPErrorCloudServiceCapabilityMissing 2
+MPErrorNetworkConnectionFailed 3
+MPErrorNotFound 4
+MPErrorNotSupported 5
+MPErrorPermissionDenied 1
+MPErrorRequestTimedOut 7
+MPErrorUnknown 0
+MPMediaTypeAny -1
+MPMediaTypeAnyAudio 255
+MPMediaTypeAnyVideo 65280
+MPMediaTypeAudioBook 4
+MPMediaTypeAudioITunesU 8
+MPMediaTypeHomeVideo 8192
+MPMediaTypeMovie 256
+MPMediaTypeMusic 1
+MPMediaTypeMusicVideo 2048
+MPMediaTypePodcast 2
+MPMediaTypeTVShow 512
+MPMediaTypeVideoITunesU 4096
+MPMediaTypeVideoPodcast 1024
+MPNowPlayingInfoLanguageOptionTypeAudible 0
+MPNowPlayingInfoLanguageOptionTypeLegible 1
+MPNowPlayingInfoMediaTypeAudio 1
+MPNowPlayingInfoMediaTypeNone 0
+MPNowPlayingInfoMediaTypeVideo 2
+MPNowPlayingPlaybackStateInterrupted 4
+MPNowPlayingPlaybackStatePaused 2
+MPNowPlayingPlaybackStatePlaying 1
+MPNowPlayingPlaybackStateStopped 3
+MPNowPlayingPlaybackStateUnknown 0
+MPRemoteCommandHandlerStatusCommandFailed 200
+MPRemoteCommandHandlerStatusDeviceNotFound 120
+MPRemoteCommandHandlerStatusNoActionableNowPlayingItem 110
+MPRemoteCommandHandlerStatusNoSuchContent 100
+MPRemoteCommandHandlerStatusSuccess 0
+MPRepeatTypeAll 2
+MPRepeatTypeOff 0
+MPRepeatTypeOne 1
+MPSeekCommandEventTypeBeginSeeking 0
+MPSeekCommandEventTypeEndSeeking 1
+MPShuffleTypeCollections 2
+MPShuffleTypeItems 1
+MPShuffleTypeOff 0
+MPErrorDomain MPErrorDomain
+MPLanguageOptionCharacteristicContainsOnlyForcedSubtitles public.subtitles.forced-only
+MPLanguageOptionCharacteristicDescribesMusicAndSound public.accessibility.describes-music-and-sound
+MPLanguageOptionCharacteristicDescribesVideo public.accessibility.describes-video
+MPLanguageOptionCharacteristicDubbedTranslation public.translation.dubbed
+MPLanguageOptionCharacteristicEasyToRead public.easy-to-read
+MPLanguageOptionCharacteristicIsAuxiliaryContent public.auxiliary-content
+MPLanguageOptionCharacteristicIsMainProgramContent public.main-program-content
+MPLanguageOptionCharacteristicLanguageTranslation public.translation
+MPLanguageOptionCharacteristicTranscribesSpokenDialog public.accessibility.transcribes-spoken-dialog
+MPLanguageOptionCharacteristicVoiceOverTranslation public.translation.voice-over
+MPMediaEntityPropertyPersistentID persistentID
+MPMediaItemPropertyAlbumArtist albumArtist
+MPMediaItemPropertyAlbumArtistPersistentID albumArtistPID
+MPMediaItemPropertyAlbumPersistentID albumPID
+MPMediaItemPropertyAlbumTitle albumTitle
+MPMediaItemPropertyAlbumTrackCount albumTrackCount
+MPMediaItemPropertyAlbumTrackNumber albumTrackNumber
+MPMediaItemPropertyArtist artist
+MPMediaItemPropertyArtistPersistentID artistPID
+MPMediaItemPropertyArtwork artwork
+MPMediaItemPropertyAssetURL assetURL
+MPMediaItemPropertyBeatsPerMinute beatsPerMinute
+MPMediaItemPropertyBookmarkTime bookmarkTime
+MPMediaItemPropertyComments comments
+MPMediaItemPropertyComposer composer
+MPMediaItemPropertyComposerPersistentID composerPID
+MPMediaItemPropertyDateAdded dateAdded
+MPMediaItemPropertyDiscCount discCount
+MPMediaItemPropertyDiscNumber discNumber
+MPMediaItemPropertyGenre genre
+MPMediaItemPropertyGenrePersistentID genrePID
+MPMediaItemPropertyHasProtectedAsset hasProtectedAsset
+MPMediaItemPropertyIsCloudItem isCloudItem
+MPMediaItemPropertyIsCompilation isCompilation
+MPMediaItemPropertyIsExplicit isExplicit
+MPMediaItemPropertyIsPreorder isPreorder
+MPMediaItemPropertyLastPlayedDate lastPlayedDate
+MPMediaItemPropertyLyrics lyrics
+MPMediaItemPropertyMediaType mediaType
+MPMediaItemPropertyPersistentID persistentID
+MPMediaItemPropertyPlayCount playCount
+MPMediaItemPropertyPlaybackDuration playbackDuration
+MPMediaItemPropertyPlaybackStoreID playbackStoreID
+MPMediaItemPropertyPodcastPersistentID podcastPID
+MPMediaItemPropertyPodcastTitle podcastTitle
+MPMediaItemPropertyRating rating
+MPMediaItemPropertyReleaseDate releaseDate
+MPMediaItemPropertySkipCount skipCount
+MPMediaItemPropertyTitle title
+MPMediaItemPropertyUserGrouping userGrouping
+MPMediaPlaybackIsPreparedToPlayDidChangeNotification MPMediaPlaybackIsPreparedToPlayDidChangeNotification
+MPMediaPlaylistPropertyAuthorDisplayName externalVendorDisplayName
+MPMediaPlaylistPropertyCloudGlobalID cloudGlobalID
+MPMediaPlaylistPropertyDescriptionText descriptionInfo
+MPMediaPlaylistPropertyName name
+MPMediaPlaylistPropertyPersistentID playlistPersistentID
+MPMediaPlaylistPropertyPlaylistAttributes playlistAttributes
+MPMediaPlaylistPropertySeedItems seedItems
+MPNowPlayingInfoCollectionIdentifier MPNowPlayingInfoCollectionIdentifier
+MPNowPlayingInfoPropertyAssetURL MPNowPlayingInfoPropertyAssetURL
+MPNowPlayingInfoPropertyAvailableLanguageOptions MPNowPlayingInfoPropertyAvailableLanguageOptions
+MPNowPlayingInfoPropertyChapterCount MPNowPlayingInfoPropertyChapterCount
+MPNowPlayingInfoPropertyChapterNumber MPNowPlayingInfoPropertyChapterNumber
+MPNowPlayingInfoPropertyCurrentLanguageOptions MPNowPlayingInfoPropertyCurrentLanguageOption
+MPNowPlayingInfoPropertyCurrentPlaybackDate MPNowPlayingInfoPropertyCurrentPlaybackDate
+MPNowPlayingInfoPropertyDefaultPlaybackRate MPNowPlayingInfoPropertyDefaultPlaybackRate
+MPNowPlayingInfoPropertyElapsedPlaybackTime MPNowPlayingInfoPropertyElapsedPlaybackTime
+MPNowPlayingInfoPropertyExternalContentIdentifier MPNowPlayingInfoPropertyExternalContentIdentifier
+MPNowPlayingInfoPropertyExternalUserProfileIdentifier MPNowPlayingInfoPropertyExternalUserProfileIdentifier
+MPNowPlayingInfoPropertyIsLiveStream MPNowPlayingInfoPropertyIsLiveStream
+MPNowPlayingInfoPropertyMediaType MPNowPlayingInfoPropertyMediaType
+MPNowPlayingInfoPropertyPlaybackProgress MPNowPlayingInfoPropertyPlaybackProgress
+MPNowPlayingInfoPropertyPlaybackQueueCount MPNowPlayingInfoPropertyPlaybackQueueCount
+MPNowPlayingInfoPropertyPlaybackQueueIndex MPNowPlayingInfoPropertyPlaybackQueueIndex
+MPNowPlayingInfoPropertyPlaybackRate MPNowPlayingInfoPropertyPlaybackRate
+MPNowPlayingInfoPropertyServiceIdentifier MPNowPlayingInfoPropertyServiceIdentifier