From 06e2232917ee465cdb888df51213da9e4682b646 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 4 Jun 2016 17:19:24 -0700 Subject: [PATCH] factor: CFSTRING: ; --- .../launch-services/launch-services.factor | 136 +++++++++--------- ffi/core-foundation/run-loop/run-loop.factor | 2 +- ffi/core-foundation/strings/strings.factor | 6 +- ffi/qtkit/qtkit.factor | 16 +-- 4 files changed, 79 insertions(+), 81 deletions(-) diff --git a/ffi/core-foundation/launch-services/launch-services.factor b/ffi/core-foundation/launch-services/launch-services.factor index 106ac41f3f..97363dfa89 100644 --- a/ffi/core-foundation/launch-services/launch-services.factor +++ b/ffi/core-foundation/launch-services/launch-services.factor @@ -22,92 +22,92 @@ FUNCTION: OSStatus FSRefMakePath ( ) ; ! Abstract base types -CFSTRING: kUTTypeItem "public.item" -CFSTRING: kUTTypeContent "public.content" -CFSTRING: kUTTypeCompositeContent "public.composite-content" -CFSTRING: kUTTypeApplication "com.apple.application" -CFSTRING: kUTTypeMessage "public.message" -CFSTRING: kUTTypeContact "public.contact" -CFSTRING: kUTTypeArchive "public.archive" -CFSTRING: kUTTypeDiskImage "public.disk-image" +CFSTRING: kUTTypeItem "public.item" ; +CFSTRING: kUTTypeContent "public.content" ; +CFSTRING: kUTTypeCompositeContent "public.composite-content" ; +CFSTRING: kUTTypeApplication "com.apple.application" ; +CFSTRING: kUTTypeMessage "public.message" ; +CFSTRING: kUTTypeContact "public.contact" ; +CFSTRING: kUTTypeArchive "public.archive" ; +CFSTRING: kUTTypeDiskImage "public.disk-image" ; ! Concrete base types -CFSTRING: kUTTypeData "public.data" -CFSTRING: kUTTypeDirectory "public.directory" -CFSTRING: kUTTypeResolvable "com.apple.resolvable" -CFSTRING: kUTTypeSymLink "public.symlink" -CFSTRING: kUTTypeMountPoint "com.apple.mount-point" -CFSTRING: kUTTypeAliasFile "com.apple.alias-file" -CFSTRING: kUTTypeAliasRecord "com.apple.alias-record" -CFSTRING: kUTTypeURL "public.url" -CFSTRING: kUTTypeFileURL "public.file-url" +CFSTRING: kUTTypeData "public.data" ; +CFSTRING: kUTTypeDirectory "public.directory" ; +CFSTRING: kUTTypeResolvable "com.apple.resolvable" ; +CFSTRING: kUTTypeSymLink "public.symlink" ; +CFSTRING: kUTTypeMountPoint "com.apple.mount-point" ; +CFSTRING: kUTTypeAliasFile "com.apple.alias-file" ; +CFSTRING: kUTTypeAliasRecord "com.apple.alias-record" ; +CFSTRING: kUTTypeURL "public.url" ; +CFSTRING: kUTTypeFileURL "public.file-url" ; ! Text types -CFSTRING: kUTTypeText "public.text" -CFSTRING: kUTTypePlainText "public.plain-text" -CFSTRING: kUTTypeUTF8PlainText "public.utf8-plain-text" -CFSTRING: kUTTypeUTF16ExternalPlainText "public.utf16-external-plain-text" -CFSTRING: kUTTypeUTF16PlainText "public.utf16-plain-text" -CFSTRING: kUTTypeRTF "public.rtf" -CFSTRING: kUTTypeHTML "public.html" -CFSTRING: kUTTypeXML "public.xml" -CFSTRING: kUTTypeSourceCode "public.source-code" -CFSTRING: kUTTypeCSource "public.c-source" -CFSTRING: kUTTypeObjectiveCSource "public.objective-c-source" -CFSTRING: kUTTypeCPlusPlusSource "public.c-plus-plus-source" -CFSTRING: kUTTypeObjectiveCPlusPlusSource "public.objective-c-plus-plus-source" -CFSTRING: kUTTypeCHeader "public.c-header" -CFSTRING: kUTTypeCPlusPlusHeader "public.c-plus-plus-header" -CFSTRING: kUTTypeJavaSource "com.sun.java-source" +CFSTRING: kUTTypeText "public.text" ; +CFSTRING: kUTTypePlainText "public.plain-text" ; +CFSTRING: kUTTypeUTF8PlainText "public.utf8-plain-text" ; +CFSTRING: kUTTypeUTF16ExternalPlainText "public.utf16-external-plain-text" ; +CFSTRING: kUTTypeUTF16PlainText "public.utf16-plain-text" ; +CFSTRING: kUTTypeRTF "public.rtf" ; +CFSTRING: kUTTypeHTML "public.html" ; +CFSTRING: kUTTypeXML "public.xml" ; +CFSTRING: kUTTypeSourceCode "public.source-code" ; +CFSTRING: kUTTypeCSource "public.c-source" ; +CFSTRING: kUTTypeObjectiveCSource "public.objective-c-source" ; +CFSTRING: kUTTypeCPlusPlusSource "public.c-plus-plus-source" ; +CFSTRING: kUTTypeObjectiveCPlusPlusSource "public.objective-c-plus-plus-source" ; +CFSTRING: kUTTypeCHeader "public.c-header" ; +CFSTRING: kUTTypeCPlusPlusHeader "public.c-plus-plus-header" ; +CFSTRING: kUTTypeJavaSource "com.sun.java-source" ; ! Composite content types -CFSTRING: kUTTypePDF "com.adobe.pdf" -CFSTRING: kUTTypeRTFD "com.apple.rtfd" -CFSTRING: kUTTypeFlatRTFD "com.apple.flat-rtfd" -CFSTRING: kUTTypeTXNTextAndMultimediaData "com.apple.txn.text-multimedia-data" -CFSTRING: kUTTypeWebArchive "com.apple.webarchive" +CFSTRING: kUTTypePDF "com.adobe.pdf" ; +CFSTRING: kUTTypeRTFD "com.apple.rtfd" ; +CFSTRING: kUTTypeFlatRTFD "com.apple.flat-rtfd" ; +CFSTRING: kUTTypeTXNTextAndMultimediaData "com.apple.txn.text-multimedia-data" ; +CFSTRING: kUTTypeWebArchive "com.apple.webarchive" ; ! Image content types -CFSTRING: kUTTypeImage "public.image" -CFSTRING: kUTTypeJPEG "public.jpeg" -CFSTRING: kUTTypeJPEG2000 "public.jpeg-2000" -CFSTRING: kUTTypeTIFF "public.tiff" -CFSTRING: kUTTypePICT "com.apple.pict" -CFSTRING: kUTTypeGIF "com.compuserve.gif" -CFSTRING: kUTTypePNG "public.png" -CFSTRING: kUTTypeQuickTimeImage "com.apple.quicktime-image" -CFSTRING: kUTTypeAppleICNS "com.apple.icns" -CFSTRING: kUTTypeBMP "com.microsoft.bmp" -CFSTRING: kUTTypeICO "com.microsoft.ico" +CFSTRING: kUTTypeImage "public.image" ; +CFSTRING: kUTTypeJPEG "public.jpeg" ; +CFSTRING: kUTTypeJPEG2000 "public.jpeg-2000" ; +CFSTRING: kUTTypeTIFF "public.tiff" ; +CFSTRING: kUTTypePICT "com.apple.pict" ; +CFSTRING: kUTTypeGIF "com.compuserve.gif" ; +CFSTRING: kUTTypePNG "public.png" ; +CFSTRING: kUTTypeQuickTimeImage "com.apple.quicktime-image" ; +CFSTRING: kUTTypeAppleICNS "com.apple.icns" ; +CFSTRING: kUTTypeBMP "com.microsoft.bmp" ; +CFSTRING: kUTTypeICO "com.microsoft.ico" ; ! Audiovisual content types -CFSTRING: kUTTypeAudiovisualContent "public.audiovisual-content" -CFSTRING: kUTTypeMovie "public.movie" -CFSTRING: kUTTypeVideo "public.video" -CFSTRING: kUTTypeAudio "public.audio" -CFSTRING: kUTTypeQuickTimeMovie "com.apple.quicktime-movie" -CFSTRING: kUTTypeMPEG "public.mpeg" -CFSTRING: kUTTypeMPEG4 "public.mpeg-4" -CFSTRING: kUTTypeMP3 "public.mp3" -CFSTRING: kUTTypeMPEG4Audio "public.mpeg-4-audio" -CFSTRING: kUTTypeAppleProtectedMPEG4Audio "com.apple.protected-mpeg-4-audio" +CFSTRING: kUTTypeAudiovisualContent "public.audiovisual-content" ; +CFSTRING: kUTTypeMovie "public.movie" ; +CFSTRING: kUTTypeVideo "public.video" ; +CFSTRING: kUTTypeAudio "public.audio" ; +CFSTRING: kUTTypeQuickTimeMovie "com.apple.quicktime-movie" ; +CFSTRING: kUTTypeMPEG "public.mpeg" ; +CFSTRING: kUTTypeMPEG4 "public.mpeg-4" ; +CFSTRING: kUTTypeMP3 "public.mp3" ; +CFSTRING: kUTTypeMPEG4Audio "public.mpeg-4-audio" ; +CFSTRING: kUTTypeAppleProtectedMPEG4Audio "com.apple.protected-mpeg-4-audio" ; ! Directory types -CFSTRING: kUTTypeFolder "public.folder" -CFSTRING: kUTTypeVolume "public.volume" -CFSTRING: kUTTypePackage "com.apple.package" -CFSTRING: kUTTypeBundle "com.apple.bundle" -CFSTRING: kUTTypeFramework "com.apple.framework" +CFSTRING: kUTTypeFolder "public.folder" ; +CFSTRING: kUTTypeVolume "public.volume" ; +CFSTRING: kUTTypePackage "com.apple.package" ; +CFSTRING: kUTTypeBundle "com.apple.bundle" ; +CFSTRING: kUTTypeFramework "com.apple.framework" ; ! Application types -CFSTRING: kUTTypeApplicationBundle "com.apple.application-bundle" -CFSTRING: kUTTypeApplicationFile "com.apple.application-file" +CFSTRING: kUTTypeApplicationBundle "com.apple.application-bundle" ; +CFSTRING: kUTTypeApplicationFile "com.apple.application-file" ; ! Contact types -CFSTRING: kUTTypeVCard "public.vcard" +CFSTRING: kUTTypeVCard "public.vcard" ; ! Misc. types -CFSTRING: kUTTypeInkText "com.apple.ink.inktext" +CFSTRING: kUTTypeInkText "com.apple.ink.inktext" ; CONSTANT: kLSUnknownCreator f ; diff --git a/ffi/core-foundation/run-loop/run-loop.factor b/ffi/core-foundation/run-loop/run-loop.factor index 95bb0f8dbe..1fb95ed5ee 100644 --- a/ffi/core-foundation/run-loop/run-loop.factor +++ b/ffi/core-foundation/run-loop/run-loop.factor @@ -55,7 +55,7 @@ FUNCTION: void CFRunLoopRemoveTimer ( CFStringRef mode ) ; -CFSTRING: CFRunLoopDefaultMode "kCFRunLoopDefaultMode" +CFSTRING: CFRunLoopDefaultMode "kCFRunLoopDefaultMode" ; TUPLE: run-loop-state fds sources timers ; diff --git a/ffi/core-foundation/strings/strings.factor b/ffi/core-foundation/strings/strings.factor index 1665c4f35f..005edb1f46 100644 --- a/ffi/core-foundation/strings/strings.factor +++ b/ffi/core-foundation/strings/strings.factor @@ -1,12 +1,10 @@ ! Copyright (C) 2008, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. - USING: accessors alien alien.c-types alien.data alien.syntax byte-vectors combinators.short-circuit core-foundation core-foundation.arrays core-foundation.data destructors fry io.encodings.string io.encodings.utf8 kernel math math.order -parser sequences words ; - +parser sequences words lexer ; in: core-foundation.strings TYPEDEF: void* CFStringRef ; @@ -99,6 +97,6 @@ FUNCTION: CFStringRef CFCopyTypeIDDescription ( CFTypeID type_id ) ; CFGetTypeID [ CFCopyTypeIDDescription &CFRelease CF>string ] with-destructors ; SYNTAX: CFSTRING: - scan-new-word scan-object + scan-new-word scan-object ";" expect [ drop ] [ '[ _ [ _ ] initialize-alien ] ] 2bi ( -- alien ) define-declared ; diff --git a/ffi/qtkit/qtkit.factor b/ffi/qtkit/qtkit.factor index d29542a76c..314680b1fb 100644 --- a/ffi/qtkit/qtkit.factor +++ b/ffi/qtkit/qtkit.factor @@ -23,14 +23,14 @@ STRUCT: SMPTETime { mSeconds SInt16 } { mFrames SInt16 } ; -CFSTRING: QTKitErrorDomain "QTKitErrorDomain" -CFSTRING: QTErrorCaptureInputKey "QTErrorCaptureInputKey" -CFSTRING: QTErrorCaptureOutputKey "QTErrorCaptureOutputKey" -CFSTRING: QTErrorDeviceKey "QTErrorDeviceKey" -CFSTRING: QTErrorExcludingDeviceKey "QTErrorExcludingDeviceKey" -CFSTRING: QTErrorTimeKey "QTErrorTimeKey" -CFSTRING: QTErrorFileSizeKey "QTErrorFileSizeKey" -CFSTRING: QTErrorRecordingSuccesfullyFinishedKey "QTErrorRecordingSuccesfullyFinishedKey" +CFSTRING: QTKitErrorDomain "QTKitErrorDomain" ; +CFSTRING: QTErrorCaptureInputKey "QTErrorCaptureInputKey" ; +CFSTRING: QTErrorCaptureOutputKey "QTErrorCaptureOutputKey" ; +CFSTRING: QTErrorDeviceKey "QTErrorDeviceKey" ; +CFSTRING: QTErrorExcludingDeviceKey "QTErrorExcludingDeviceKey" ; +CFSTRING: QTErrorTimeKey "QTErrorTimeKey" ; +CFSTRING: QTErrorFileSizeKey "QTErrorFileSizeKey" ; +CFSTRING: QTErrorRecordingSuccesfullyFinishedKey "QTErrorRecordingSuccesfullyFinishedKey" ; CONSTANT: QTErrorUnknown -1 ; CONSTANT: QTErrorIncompatibleInput 1002 ;