Merge branch 'master' into autobuild/alpha_v380

Author: c-lipka

README.md

@@ -5,7 +5,7 @@
 [![AppVeyor Build status](https://img.shields.io/appveyor/ci/c-lipka/povray-exwy4.svg?label=appveyor)](https://ci.appveyor.com/project/c-lipka/povray-exwy4 "AppVeyor: Windows Server 2012 with Visual Studio 2015")
 [![Travis CI Build Status](https://img.shields.io/travis/POV-Ray/povray.svg?label=travis%20ci)](https://travis-ci.org/POV-Ray/povray "Travis CI: Ubuntu 12.04 LTE 64-bit with gcc 4.6; OS X 10.11 with clang 4.2")
 [![Coverity Code Analysis](https://scan.coverity.com/projects/269/badge.svg)](https://scan.coverity.com/projects/pov-ray "Coverity: Static Code Analysis")
-[![Maintenance Status](https://img.shields.io/maintenance/yes/2018.svg)](README.md "Last edited 2018-05-22")
+[![Maintenance Status](https://img.shields.io/maintenance/yes/2019.svg)](README.md "Last edited 2019-01-03")
 
 - [License](#license)
 - [Forums](#forums)

changes.txt

@@ -66,6 +66,9 @@ Changed Behaviour
     decided to not fix the change to work as originally intended, and instead
     only allow type mixing if the array has explicitly been declared as
     `mixed`. See the documentation for details.
+  - The `defined()` pseudo-function now returns `true` (while printing a
+    warning) if applied to reserved words. The `#ifdef` and `#ifndef` directives
+    also behave accordingly.
   - The dithering implementation has been modified, and may produce slightly
     different results for otherwise identical scenes.
   - The PGM (greyscale variant of PPM) output gamma handling now matches that
@@ -74,6 +77,10 @@ Changed Behaviour
   - Greyscale output no longer automatically forces bit depth to 16 bpc. To get
     16 bpp greyscale output, explicitly specify `Bits_Per_Color=16`.
   - Preview now reflects greyscale setting.
+  - The `charset` global setting has been deprecated and may no longer work as
+    expected. Input files conforming to ASCII, UTF-8, Latin-1 or Windows-1252
+    encoding will instead be auto-detected, while other encodings are currently
+    unsupported.
 
 New Features
 ------------

distribution/include/ior.inc

@@ -184,7 +184,7 @@
 #declare ( iorPolycarbonate                 , optional dispPolycarbonate                 ) = ( iorPC   , dispPC   );
 #declare ( iorPolymethylmethacrylate        , optional dispPolymethylmethacrylate        ) = ( iorPMMA , dispPMMA );
 #declare ( iorPolystyrene                   , optional dispPolystyrene                   ) = ( iorPS   , dispPS   );
-#declare ( iorPolyvinylchloride             , optional dispPolyvinylchloride             ) = ( iorPVP  , dispPVP  );
+#declare ( iorPolyvinylchloride             , optional dispPolyvinylchloride             ) = ( iorPVC  , dispPVC  );
 #declare ( iorPolyvinylpyrrolidone          , optional dispPolyvinylpyrrolidone          ) = ( iorPVP  , dispPVP  );
 
 // Plastics Trademarks

revision.txt

@@ -35,6 +35,294 @@ Notes:
 POV-Ray v3.8.0-???
 ------------------------------------------------------------------------------
 
+Commit c341c943 on 2019-01-11 by Christoph Lipka
+
+    Merge branch 'refactor/tokenizer'
+
+Commit 21241276 on 2019-01-11 by Christoph Lipka
+
+    [parser] Earmark text primitive `cmap` extension as experimental.
+
+Commit 90afa652 on 2019-01-11 by Christoph Lipka
+
+    Parser code cleanup, comments and character encoding changes.
+    Also changes to TrueType handling code related to character mapping.
+
+Commit 99ce66ab on 2019-01-03 by Christoph Lipka
+
+    [parser] Eliminate loop from `Parse_Directive()`.
+
+Commit f0b7ee29 on 2019-01-02 by Christoph Lipka
+
+    [parser] Add more experimental assertions.
+
+Commit 83ff9486 on 2019-01-02 by Christoph Lipka
+
+    [parser] Eliminate some potential issues related to token counting.
+
+Commit c89f597a on 2019-01-02 by Christoph Lipka
+
+    [parser] More refactoring related to symbol tables.
+
+Commit 72433b2f on 2019-01-02 by Christoph Lipka
+
+    Pull task management out of Parser module.
+
+Commit 143614db on 2018-12-16 by Christoph Lipka
+
+    [parser] Move symbol table handling into separate class.
+
+Commit 73726447 on 2018-12-15 by Christoph Lipka
+
+    [parser] Remove some obsolete constants.
+
+Commit a659aac9 on 2018-12-12 by Christoph Lipka
+
+    [base] Change some string parameters from C-style to C++-style.
+
+Commit 8c5cf5e7 on 2018-12-12 by Christoph Lipka
+
+    [parser] Change some C-style strings to C++-style strings.
+
+Commit d806f661 on 2018-12-11 by Christoph Lipka
+
+    [parser] More miscellaneous refactoring.
+
+Commit 7d8dc2db on 2018-12-09 by Christoph Lipka
+
+    [parser] Fix build error introduced with previous commit.
+
+Commit 7c85b488 on 2018-12-08 by Christoph Lipka
+
+    [parser] Miscellaneous refactoring.
+
+Commit 4eb65137 on 2018-12-08 by Christoph Lipka
+
+    [parser] Fix a memory leak.
+
+Commit 8e2d4495 on 2018-11-28 by Christoph Lipka
+
+    Merge branch 'master' into refactor/tokenizer
+
+Commit 063e6a9e on 2018-09-23 by Christoph Lipka
+
+    Merge branch 'master' into refactor/tokenizer
+
+Commit 730c137d on 2018-09-19 by Christoph Lipka
+
+    Merge branch 'master' into refactor/tokenizer
+
+Commit 7361007d on 2018-09-19 by Christoph Lipka
+
+    [parser] Fix parse error when a macro invocation is immediately followed
+    by the end of file.
+
+Commit d4e74268 on 2018-09-18 by Christoph Lipka
+
+    Fix crash trying to read a density file.
+
+Commit c661589c on 2018-09-17 by Christoph Lipka
+
+    [parser] Clean up behaviour regarding dictionaries and `#ifdef`.
+
+Commit 06f9a321 on 2018-09-17 by Christoph Lipka
+
+    Merge branch 'master' into refactor/tokenizer
+
+Commit 33b5edc9 on 2018-09-12 by Christoph Lipka
+
+    Merge branch 'master' into refactor/tokenizer
+
+Commit aa871435 on 2018-06-02 by Christoph Lipka
+
+    Trim obsolete code from string handling in parser.
+
+    - `String_Literal_To_UCS2` was found to only be called in contexts
+      where string encoding is inevitably set to ASCII, and with `pathname`
+      parameter set to `false`.
+    - `String_To_UCS2` was found to only be called with pure ASCII strings,
+      except potentially when parsing the `datetime()` function (first
+      introduced in v3.7) with `#version` set to a pre-v3.5 version.
+
+Commit db025cfd on 2018-06-01 by Christoph Lipka
+
+    Re-implement support for UTF-8 encoded source files with signature BOM.
+
+Commit fa25626c on 2018-06-01 by Christoph Lipka
+
+    Minor cleanup of parser code.
+
+Commit ac88d0e7 on 2018-05-31 by Christoph Lipka
+
+    Re-enable `#read` statement.
+
+Commit 9a2cd33e on 2018-05-31 by Christoph Lipka
+
+    Minor refactoring of `#for` loop code.
+
+Commit a5e8ee62 on 2018-05-24 by Christoph Lipka
+
+    Re-enable version-dependent handlng of backslashes in file name literals.
+
+Commit af7e2a8e on 2018-05-23 by Christoph Lipka
+
+    Improve scanner performance.
+
+Commit eae2d4c6 on 2018-05-23 by Christoph Lipka
+
+    Re-enable macro caching.
+
+Commit 8e915f7d on 2018-05-23 by Christoph Lipka
+
+    Fix scanner/tokenizer errors getting reported as "unknown error".
+
+Commit 51e3aaa2 on 2018-05-22 by Christoph Lipka
+
+    Merge branch 'master' into refactor/tokenizer
+
+Commit e3036cb9 on 2018-05-22 by Christoph Lipka
+
+    Fix another build error on clang/Mac.
+
+Commit 4e414697 on 2018-05-22 by Christoph Lipka
+
+    Fix build errors in previous commit.
+
+Commit e53e181e on 2018-05-22 by Christoph Lipka
+
+    Redesign parser scanner/tokenizer stage.
+
+Commit 85db57d9 on 2019-01-11 by Christoph Lipka
+
+    [ci skip] Update change log.
+
+Commit 851c3e3d on 2019-01-03 by Christoph Lipka
+
+    [ci skip] Fix bug in `ior.inc`.
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9945627
+------------------------------------------------------------------------------
+
+Commit a9eb1a62 on 2018-11-28 by Christoph Lipka
+
+    [parser] Fix dynamically-sized array initializer causing the parser to
+    lock up.
+    Also fix a debug assertion along the way.
+
+Commit a969d8fe on 2018-10-29 by Christoph Lipka
+
+    [ci skip] Update docs.
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9893777
+------------------------------------------------------------------------------
+
+Commit 55afc36b on 2018-10-21 by Christoph Lipka
+
+    [parser] Fix bug trying to undefine a dictionary element.
+
+Commit c3fec22c on 2018-10-21 by Christoph Lipka
+
+    Fix dithering being stuck to Stucki.
+
+Commit f2ebbb75 on 2018-10-01 by Christoph Lipka
+
+    [base] Fix resource leak introduced with recent commit 7b8df044
+    (CID 1439830).
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9861167
+------------------------------------------------------------------------------
+
+Commit fa813f12 on 2018-10-01 by Christoph Lipka
+
+    Move lonely gamma sample scene from `scenes/gamma` to `scenes/output`.
+
+Commit 7b8df044 on 2018-09-30 by Christoph Lipka
+
+    Change output handling.
+
+    - Add support for bit depths as low as 1 bpc.
+    - Add support for low-depth greyscale output.
+    - Add support for greyscale preview.
+    - Change PGM gamma handling.
+    - Add more dither algorithms, including blue noise ordered dither.
+
+    Also refactor some related code.
+
+Commit b2972995 on 2018-09-28 by Christoph Lipka
+
+    Overhaul "meta-make" process to use a proper makefile.
+
+Commit c0cb3c66 on 2018-09-26 by Christoph Lipka
+
+    Miscellaneous changes to dithering implementation.
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9850723
+------------------------------------------------------------------------------
+
+Commit 7bcbea72 on 2018-09-23 by Christoph Lipka
+
+    [parser] Implement mixed-type arrays at last, albeit with a change to
+    syntax. Also refactor array related code.
+
+Commit b5b17eaa on 2018-09-19 by Christoph Lipka
+
+    [parser] Change defaults to no longer be determined by very first
+    `#version` statement.
+    Instead, subsequent `#version` statements may switch defaults back and
+    forth until the first `default` statement.
+
+Commit 45347628 on 2018-09-19 by Christoph Lipka
+
+    [core] Remove an assertion from `VectorPool` class that turned out to
+    be violated, adding a corresponding comment.
+
+Commit 9f9b392e on 2018-09-19 by Christoph Lipka
+
+    [parser] Modify bicubic patch and matrix syntax to allow for trailing
+    commas.
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9844500
+------------------------------------------------------------------------------
+
+Commit 425aa488 on 2018-09-19 by Christoph Lipka
+
+    [core] Amendment to previous commit.
+
+Commit 6d0e6f93 on 2018-09-19 by Christoph Lipka
+
+    [core] Fix memory leak in `VectorPool` class.
+
+Commit 68c73806 on 2018-09-17 by Christoph Lipka
+
+    [core] Fix a coding flaw in `randomsequence.cpp` function
+    `Uniform2dOnSquare()`.
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9841009
+------------------------------------------------------------------------------
+
+Commit 8c1eb72b on 2018-09-17 by Christoph Lipka
+
+    Add anti-aliasing mode 3 (port from UberPOV).
+
+    Also add some bits of infrastructure for future optimization and better
+    co-operation of various stochastic features like jittered area lights,
+    jittered media sampling, subsurface light transport and the like.
+
+Commit 8fc5463e on 2018-09-13 by Christoph Lipka
+
+    Fix bug in `f_enneper` inbuilt isosurface function detected by static
+    code analysis (CID 1372542-1372544).
+
+Commit 508f60cf on 2018-09-12 by Christoph Lipka
+
+    Update change log.
+
 Commit 915abb22 on 2018-09-12 by Christoph Lipka
 
     Fix uninitialized variables in photons code discovered by static code

source/backend/configbackend.h

@@ -10,7 +10,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -94,7 +94,7 @@ static_assert(
 /// @note
 ///     The macro is responsible for creating a sufficiently large result buffer, using @ref POV_MALLOC().
 /// @note
-///     The result must be a genuine UCS2 string. UCS4/Unicode characters outside the Base Multilingual Plane
+///     The result must be a genuine UCS2 string. UCS4/Unicode characters outside the Basic Multilingual Plane
 ///     are not supported.
 ///
 /// @param[in]  ts  Null-terminated byte sequence to convert.

source/backend/control/messagefactory.cpp

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -63,15 +63,15 @@ MessageFactory::~MessageFactory()
 {}
 
 void MessageFactory::SendMessage(MessageClass mc, WarningLevel level, const char *text,
-                                 const UCS2 *filename, POV_LONG line, POV_LONG column, POV_OFF_T offset)
+                                 const UCS2String& filename, POV_LONG line, POV_LONG column, POV_OFF_T offset)
 {
     POVMSObject msg;
     unsigned int msgIdent;
 
     (void)POVMSObject_New(&msg, kPOVObjectClass_ControlData);
 
-    if (filename != nullptr)
-        (void)POVMSUtil_SetUCS2String(&msg, kPOVAttrib_FileName, filename);
+    if (!filename.empty())
+        (void)POVMSUtil_SetUCS2String(&msg, kPOVAttrib_FileName, filename.c_str());
     if (line != -1)
         (void)POVMSUtil_SetLong(&msg, kPOVAttrib_Line, line);
     if (column != -1)

source/backend/control/messagefactory.h

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -63,7 +63,7 @@ class MessageFactory : public GenericMessenger
         RenderBackend::ViewId viewId;
 
         virtual void SendMessage(MessageClass mc, WarningLevel level, const char *text,
-                                 const UCS2 *filename = nullptr, POV_LONG line = -1, POV_LONG column = -1, POV_OFF_T offset = -1);
+                                 const UCS2String& filename = u"", POV_LONG line = -1, POV_LONG column = -1, POV_OFF_T offset = -1) override;
 };
 
 }