Skip to content

Commit

Permalink
Fixes to string wrapping for PascalCG
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwarfland
dwarfland committed Aug 11, 2017
1 parent b34a0a1 commit 9cec8f3
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 149 deletions.
11 changes: 9 additions & 2 deletions CGPascalCodeGenerator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,12 +869,19 @@ public __abstract class CGPascalCodeGenerator : CGCodeGenerator {
return;
}

let startLocation = lastStartLocation ?? currentLocation.virtualColumn
var startLocation = lastStartLocation ?? currentLocation.virtualColumn
if startLocation > Integer(Double(splitLinesLongerThan)*0.75) {
startLocation = Integer(Double(splitLinesLongerThan)*0.75)
if currentLocation.virtualColumn > splitLinesLongerThan-Math.Min(10,length(string)) {
AppendLine()
AppendIndentToVirtualColumn(startLocation)
}
}

var inQuotes = false
for i in 0 ..< len {

if currentLocation.virtualColumn > splitLinesLongerThan {
if i > 0 && currentLocation.virtualColumn > splitLinesLongerThan {
if inQuotes {
Append(quoteChar)
inQuotes = false
Expand Down
28 changes: 14 additions & 14 deletions Codegen4.Shared.elements
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0" DefaultTargets="Build">
<PropertyGroup Label="Globals">
<ProjectGuid>615FC69D-8D8A-4996-9D58-B042CD883941</ProjectGuid>
<Name>CodegGen4 (Shared)</Name>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Codegen4.Shared</RootNamespace>
</PropertyGroup>
<Import Project="Codegen4.Shared.projitems" Label="Shared"/>
<Import Project="$(MSBuildExtensionsPath)\RemObjects Software\Elements\RemObjects.Elements.SharedProject.targets"/>
<PropertyGroup>
<PreBuildEvent/>
</PropertyGroup>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" DefaultTargets="Build">
<PropertyGroup Label="Globals">
<ProjectGuid>615FC69D-8D8A-4996-9D58-B042CD883941</ProjectGuid>
<Name>CodegGen4 (Shared)</Name>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Codegen4.Shared</RootNamespace>
</PropertyGroup>
<Import Project="Codegen4.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\RemObjects Software\Elements\RemObjects.Elements.SharedProject.targets" />
<PropertyGroup>
<PreBuildEvent />
</PropertyGroup>
</Project>
266 changes: 133 additions & 133 deletions Codegen4.Shared.projitems
View file
Original file line number Diff line number Diff line change
@@ -1,134 +1,134 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>615FC69D-8D8A-4996-9D58-B042CD883941</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>CodeGen4.Shared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)CGCPlusPlusCPPCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCPlusPlusHCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)TypeDefinitions.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Base.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Statements.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)TypeReferences.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Expressions.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<None Include="$(MSBuildThisFileDirectory)README.md"/>
<Compile Include="$(MSBuildThisFileDirectory)CGCodeGenerator.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGSwiftCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGPascalCodeGenerator.swift">
<VirtualFolder>Code Generation — Pascal</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGOxygeneCodeGenerator.swift">
<VirtualFolder>Code Generation — Pascal</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGObjectiveCCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGObjectiveCHCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGObjectiveCMCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGDelphiCodeGenerator.swift">
<VirtualFolder>Code Generation — Pascal</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGJavaCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCStyleCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCSharpCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCPlusPlusCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGSkeletonCodeGenerator.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Extensions.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
<None Include="$(MSBuildThisFileDirectory)LICENSE.md"/>
<Compile Include="$(MSBuildThisFileDirectory)CGJavaScriptCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGVisualBasicNetCodeGenerator.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
</ItemGroup>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>615FC69D-8D8A-4996-9D58-B042CD883941</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>CodeGen4.Shared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)CGCPlusPlusCPPCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCPlusPlusHCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)TypeDefinitions.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Base.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Statements.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)TypeReferences.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Expressions.swift">
<VirtualFolder>Code Definition</VirtualFolder>
</Compile>
<None Include="$(MSBuildThisFileDirectory)README.md" />
<Compile Include="$(MSBuildThisFileDirectory)CGCodeGenerator.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGSwiftCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGPascalCodeGenerator.swift">
<VirtualFolder>Code Generation — Pascal</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGOxygeneCodeGenerator.swift">
<VirtualFolder>Code Generation — Pascal</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGObjectiveCCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGObjectiveCHCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGObjectiveCMCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGDelphiCodeGenerator.swift">
<VirtualFolder>Code Generation — Pascal</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGJavaCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCStyleCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCSharpCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGCPlusPlusCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGSkeletonCodeGenerator.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Extensions.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
<None Include="$(MSBuildThisFileDirectory)LICENSE.md" />
<Compile Include="$(MSBuildThisFileDirectory)CGJavaScriptCodeGenerator.swift">
<VirtualFolder>Code Generation — C-Style Languages</VirtualFolder>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)CGVisualBasicNetCodeGenerator.swift">
<VirtualFolder>Code Generation</VirtualFolder>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Definition">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — C-Style Languages">
<Virtual>True</Virtual>
</Folder>
<Folder Include="Code Generation — Pascal">
<Virtual>True</Virtual>
</Folder>
</ItemGroup>
</Project>

0 comments on commit 9cec8f3

Please sign in to comment.