mirror of
				https://github.com/LadybirdBrowser/ladybird.git
				synced 2025-10-31 05:10:57 +00:00 
			
		
		
		
	Meta+Libraries+AK: Append Cxx to imported library module names in swift
At the same time, simplify CMakeLists magic for libraries that want to include Swift code in the library. The Lib-less name of the library is now always the module name for the library with any Swift additions, extensions, etc. All vfs overlays now live in a common location to make finding them easier from CMake functions. A new pattern is needed for the Lib-less modules to re-export their Cxx counterparts.
This commit is contained in:
		
							parent
							
								
									f27d638e0a
								
							
						
					
					
						commit
						c5153cb398
					
				
				
				Notes:
				
					github-actions[bot]
				
				2024-08-27 23:23:23 +00:00 
				
			
			Author: https://github.com/ADKaster
Commit: c5153cb398
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1200
			
					 13 changed files with 68 additions and 80 deletions
				
			
		|  | @ -4,6 +4,8 @@ | |||
|  * SPDX-License-Identifier: BSD-2-Clause | ||||
|  */ | ||||
| 
 | ||||
| @_exported import WebCxx | ||||
| 
 | ||||
| public class HTMLToken { | ||||
|     public struct Position { | ||||
|         var line = UInt() | ||||
|  | @ -12,10 +14,10 @@ public class HTMLToken { | |||
|     } | ||||
| 
 | ||||
|     public struct Attribute { | ||||
|         var prefix: String? | ||||
|         var localName: String | ||||
|         var namespace_: String? | ||||
|         var value: String | ||||
|         var prefix: Swift.String? | ||||
|         var localName: Swift.String | ||||
|         var namespace_: Swift.String? | ||||
|         var value: Swift.String | ||||
|         var nameStartPosition: Position | ||||
|         var nameEndPosition: Position | ||||
|         var valueStartPosition: Position | ||||
|  | @ -25,21 +27,21 @@ public class HTMLToken { | |||
|     public enum TokenType { | ||||
|         case Invalid | ||||
|         case DOCTYPE( | ||||
|             name: String?, | ||||
|             publicIdentifier: String?, | ||||
|             systemIdentifier: String?, | ||||
|             name: Swift.String?, | ||||
|             publicIdentifier: Swift.String?, | ||||
|             systemIdentifier: Swift.String?, | ||||
|             forceQuirksMode: Bool) | ||||
|         case StartTag( | ||||
|             tagName: String, | ||||
|             tagName: Swift.String, | ||||
|             selfClosing: Bool, | ||||
|             selfClosingAcknowledged: Bool, | ||||
|             attributes: [Attribute]) | ||||
|         case EndTag( | ||||
|             tagName: String, | ||||
|             tagName: Swift.String, | ||||
|             selfClosing: Bool, | ||||
|             selfClosingAcknowledged: Bool, | ||||
|             attributes: [Attribute]) | ||||
|         case Comment(data: String) | ||||
|         case Comment(data: Swift.String) | ||||
|         case Character(codePoint: Character) | ||||
|         case EndOfFile | ||||
|     } | ||||
|  | @ -78,14 +80,14 @@ public class HTMLToken { | |||
| } | ||||
| 
 | ||||
| extension HTMLToken.Position: Equatable, CustomStringConvertible { | ||||
|     public var description: String { | ||||
|     public var description: Swift.String { | ||||
|         return "\(self.line):\(self.column)" | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| extension HTMLToken.TokenType: CustomStringConvertible { | ||||
|     // FIXME: Print attributes for start/end tags | ||||
|     public var description: String { | ||||
|     public var description: Swift.String { | ||||
|         switch self { | ||||
|         case .Invalid: | ||||
|             return "Invalid" | ||||
|  | @ -106,7 +108,7 @@ extension HTMLToken.TokenType: CustomStringConvertible { | |||
| } | ||||
| 
 | ||||
| extension HTMLToken: CustomStringConvertible { | ||||
|     public var description: String { | ||||
|     public var description: Swift.String { | ||||
|         if (self.startPosition == Position()) { | ||||
|             return "HTMLToken(type: \(self.type))" | ||||
|         } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Andrew Kaster
						Andrew Kaster