From: Slava Pestov Date: Mon, 23 Feb 2009 02:02:13 +0000 (-0600) Subject: Fix conflict X-Git-Tag: 0.94~2191^2~141 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=91d0c4ed1fd5b0945264757ccc410da1727ee5ca Fix conflict --- 91d0c4ed1fd5b0945264757ccc410da1727ee5ca diff --cc basis/cocoa/enumeration/enumeration.factor index 004d52ef09,919e8f86c5..1f9430e443 --- a/basis/cocoa/enumeration/enumeration.factor +++ b/basis/cocoa/enumeration/enumeration.factor @@@ -5,14 -5,15 +5,14 @@@ sequences vectors fry libc destructor specialized-arrays.direct.alien ; IN: cocoa.enumeration - : NS-EACH-BUFFER-SIZE 16 ; inline + CONSTANT: NS-EACH-BUFFER-SIZE 16 : with-enumeration-buffers ( quot -- ) - [ - [ - "NSFastEnumerationState" malloc-object &free - NS-EACH-BUFFER-SIZE "id" heap-size * malloc-object &free - NS-EACH-BUFFER-SIZE - ] dip call + '[ + "NSFastEnumerationState" malloc-object &free + NS-EACH-BUFFER-SIZE "id" malloc-array &free + NS-EACH-BUFFER-SIZE + @ ] with-destructors ; inline :: (NSFastEnumeration-each) ( object quot: ( elt -- ) state stackbuf count -- ) diff --cc basis/colors/colors.factor index bb91aeeba3,9c55b1f29a..0cd743fa5f --- a/basis/colors/colors.factor +++ b/basis/colors/colors.factor @@@ -6,7 -6,7 +6,11 @@@ IN: color TUPLE: color ; - TUPLE: rgba < color { red read-only } { green read-only } { blue read-only } { alpha read-only } ; -TUPLE: rgba < color red green blue alpha ; ++TUPLE: rgba < color ++{ red read-only } ++{ green read-only } ++{ blue read-only } ++{ alpha read-only } ; C: rgba diff --cc extra/iokit/hid/hid.factor index ba3ca21fcb,cd9eea1409..63f91ffc78 --- a/extra/iokit/hid/hid.factor +++ b/extra/iokit/hid/hid.factor @@@ -1,58 -1,57 +1,58 @@@ USING: iokit alien alien.syntax alien.c-types kernel -system core-foundation ; +system core-foundation core-foundation.data +core-foundation.dictionaries ; IN: iokit.hid - : kIOHIDDeviceKey "IOHIDDevice" ; inline - - : kIOHIDTransportKey "Transport" ; inline - : kIOHIDVendorIDKey "VendorID" ; inline - : kIOHIDVendorIDSourceKey "VendorIDSource" ; inline - : kIOHIDProductIDKey "ProductID" ; inline - : kIOHIDVersionNumberKey "VersionNumber" ; inline - : kIOHIDManufacturerKey "Manufacturer" ; inline - : kIOHIDProductKey "Product" ; inline - : kIOHIDSerialNumberKey "SerialNumber" ; inline - : kIOHIDCountryCodeKey "CountryCode" ; inline - : kIOHIDLocationIDKey "LocationID" ; inline - : kIOHIDDeviceUsageKey "DeviceUsage" ; inline - : kIOHIDDeviceUsagePageKey "DeviceUsagePage" ; inline - : kIOHIDDeviceUsagePairsKey "DeviceUsagePairs" ; inline - : kIOHIDPrimaryUsageKey "PrimaryUsage" ; inline - : kIOHIDPrimaryUsagePageKey "PrimaryUsagePage" ; inline - : kIOHIDMaxInputReportSizeKey "MaxInputReportSize" ; inline - : kIOHIDMaxOutputReportSizeKey "MaxOutputReportSize" ; inline - : kIOHIDMaxFeatureReportSizeKey "MaxFeatureReportSize" ; inline - : kIOHIDReportIntervalKey "ReportInterval" ; inline - - : kIOHIDElementKey "Elements" ; inline - - : kIOHIDElementCookieKey "ElementCookie" ; inline - : kIOHIDElementTypeKey "Type" ; inline - : kIOHIDElementCollectionTypeKey "CollectionType" ; inline - : kIOHIDElementUsageKey "Usage" ; inline - : kIOHIDElementUsagePageKey "UsagePage" ; inline - : kIOHIDElementMinKey "Min" ; inline - : kIOHIDElementMaxKey "Max" ; inline - : kIOHIDElementScaledMinKey "ScaledMin" ; inline - : kIOHIDElementScaledMaxKey "ScaledMax" ; inline - : kIOHIDElementSizeKey "Size" ; inline - : kIOHIDElementReportSizeKey "ReportSize" ; inline - : kIOHIDElementReportCountKey "ReportCount" ; inline - : kIOHIDElementReportIDKey "ReportID" ; inline - : kIOHIDElementIsArrayKey "IsArray" ; inline - : kIOHIDElementIsRelativeKey "IsRelative" ; inline - : kIOHIDElementIsWrappingKey "IsWrapping" ; inline - : kIOHIDElementIsNonLinearKey "IsNonLinear" ; inline - : kIOHIDElementHasPreferredStateKey "HasPreferredState" ; inline - : kIOHIDElementHasNullStateKey "HasNullState" ; inline - : kIOHIDElementFlagsKey "Flags" ; inline - : kIOHIDElementUnitKey "Unit" ; inline - : kIOHIDElementUnitExponentKey "UnitExponent" ; inline - : kIOHIDElementNameKey "Name" ; inline - : kIOHIDElementValueLocationKey "ValueLocation" ; inline - : kIOHIDElementDuplicateIndexKey "DuplicateIndex" ; inline - : kIOHIDElementParentCollectionKey "ParentCollection" ; inline + CONSTANT: kIOHIDDeviceKey "IOHIDDevice" + + CONSTANT: kIOHIDTransportKey "Transport" + CONSTANT: kIOHIDVendorIDKey "VendorID" + CONSTANT: kIOHIDVendorIDSourceKey "VendorIDSource" + CONSTANT: kIOHIDProductIDKey "ProductID" + CONSTANT: kIOHIDVersionNumberKey "VersionNumber" + CONSTANT: kIOHIDManufacturerKey "Manufacturer" + CONSTANT: kIOHIDProductKey "Product" + CONSTANT: kIOHIDSerialNumberKey "SerialNumber" + CONSTANT: kIOHIDCountryCodeKey "CountryCode" + CONSTANT: kIOHIDLocationIDKey "LocationID" + CONSTANT: kIOHIDDeviceUsageKey "DeviceUsage" + CONSTANT: kIOHIDDeviceUsagePageKey "DeviceUsagePage" + CONSTANT: kIOHIDDeviceUsagePairsKey "DeviceUsagePairs" + CONSTANT: kIOHIDPrimaryUsageKey "PrimaryUsage" + CONSTANT: kIOHIDPrimaryUsagePageKey "PrimaryUsagePage" + CONSTANT: kIOHIDMaxInputReportSizeKey "MaxInputReportSize" + CONSTANT: kIOHIDMaxOutputReportSizeKey "MaxOutputReportSize" + CONSTANT: kIOHIDMaxFeatureReportSizeKey "MaxFeatureReportSize" + CONSTANT: kIOHIDReportIntervalKey "ReportInterval" + + CONSTANT: kIOHIDElementKey "Elements" + + CONSTANT: kIOHIDElementCookieKey "ElementCookie" + CONSTANT: kIOHIDElementTypeKey "Type" + CONSTANT: kIOHIDElementCollectionTypeKey "CollectionType" + CONSTANT: kIOHIDElementUsageKey "Usage" + CONSTANT: kIOHIDElementUsagePageKey "UsagePage" + CONSTANT: kIOHIDElementMinKey "Min" + CONSTANT: kIOHIDElementMaxKey "Max" + CONSTANT: kIOHIDElementScaledMinKey "ScaledMin" + CONSTANT: kIOHIDElementScaledMaxKey "ScaledMax" + CONSTANT: kIOHIDElementSizeKey "Size" + CONSTANT: kIOHIDElementReportSizeKey "ReportSize" + CONSTANT: kIOHIDElementReportCountKey "ReportCount" + CONSTANT: kIOHIDElementReportIDKey "ReportID" + CONSTANT: kIOHIDElementIsArrayKey "IsArray" + CONSTANT: kIOHIDElementIsRelativeKey "IsRelative" + CONSTANT: kIOHIDElementIsWrappingKey "IsWrapping" + CONSTANT: kIOHIDElementIsNonLinearKey "IsNonLinear" + CONSTANT: kIOHIDElementHasPreferredStateKey "HasPreferredState" + CONSTANT: kIOHIDElementHasNullStateKey "HasNullState" + CONSTANT: kIOHIDElementFlagsKey "Flags" + CONSTANT: kIOHIDElementUnitKey "Unit" + CONSTANT: kIOHIDElementUnitExponentKey "UnitExponent" + CONSTANT: kIOHIDElementNameKey "Name" + CONSTANT: kIOHIDElementValueLocationKey "ValueLocation" + CONSTANT: kIOHIDElementDuplicateIndexKey "DuplicateIndex" + CONSTANT: kIOHIDElementParentCollectionKey "ParentCollection" : kIOHIDElementVendorSpecificKey ( -- str ) cpu ppc? "VendorSpecifc" "VendorSpecific" ? ; inline