Re: [fpc-devel] RTTI
Am 24.08.2015 um 12:14 schrieb Alfred: Hello to all, Coming back from a long vacation, I saw today that there are some major changes (trunk) made to ncgrtti.pas. As you may perhaps know, I do have some interest in somewhat extended (interface) rtti. The initial extended rtti is saved in a separate branch. And working for me ! http://svn.freepascal.org/cgi-bin/viewvc.cgi/branches/interfacertti/ But new ncgrtti.pas and current interfacertti branch are very incompatible right now. Are there any plans to sync the rtti branch with new changes made towards ncgrtti.pas ? Thanks. Hi, already did the changes but have jet to find the time to integrate them in the branch. Currently they are only in a local git branch. What would be the best approach concerning a svn rebase ? mfg Steve ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] RTTI
On 24/08/15 19:30, Steve Hildebrandt wrote: already did the changes but have jet to find the time to integrate them in the branch. Currently they are only in a local git branch. What would be the best approach concerning a svn rebase ? Rebasing a publicly published branch is generally not a good idea (even when using pure git), because it invalidates all local changes that other people might have. So either you create a new branch in which these rebased changes go, or instead you merge the changes, make your changes (which may consist of just copying over the results from your rebase and then adding the file) and commit. Note that when merging using git-svn, you must add the following to your ~/.gitconfig or in .git/config of the clone: [svn] pushmergeinfo = true Additionally, merge with --no-ff. If you do those two things (and don't rebase afterwards), git-svn will properly update the svn merge information in the remote repository. Jonas ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] ppudump question
Maybe you are using empty sets in your source code? An empty set: [] has no elements and thus the compiler cannot know what the type of the elements are. In the hope that this will help, Pierre Muller -Message d'origine- De : fpc-devel-boun...@lists.freepascal.org [mailto:fpc-devel- boun...@lists.freepascal.org] De la part de Gennady Agranov Envoyé : dimanche 23 août 2015 00:46 À : fpc-devel@lists.freepascal.org Objet : [fpc-devel] ppudump question Hi, 1. I have code that heavily uses enums/sets When I use ppudump to print *.ppu files I see some sets reported with null ElType and I do not understand what causes them :( And I do not believe that they are referenced at all... Any ideas why set is reported with no ElType? Thanks, Gennady Example: json version: { Type: set, Id: 236, Size: 1, Base: 0, Max: 0, ElType: null }, text version: ** Definition Id 236 ** Set definition Type symbol : (7357) Nil DefOptions : DefStates : Element type : (7361) Nil Size : 1 Set Base : 0 Set Max : 0 xml version: set id236/id size1/size base0/base max0/max eltype/eltype /set { Type: set, Id: 92, Size: 1, Base: 0, Max: 0, ElType: null } ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
[fpc-devel] RTTI
Hello to all, Coming back from a long vacation, I saw today that there are some major changes (trunk) made to ncgrtti.pas. As you may perhaps know, I do have some interest in somewhat extended (interface) rtti. The initial extended rtti is saved in a separate branch. And working for me ! http://svn.freepascal.org/cgi-bin/viewvc.cgi/branches/interfacertti/ But new ncgrtti.pas and current interfacertti branch are very incompatible right now. Are there any plans to sync the rtti branch with new changes made towards ncgrtti.pas ? Thanks.___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] RTTI
Am 24.08.2015 um 19:46 schrieb Jonas Maebe: On 24/08/15 19:30, Steve Hildebrandt wrote: already did the changes but have jet to find the time to integrate them in the branch. Currently they are only in a local git branch. What would be the best approach concerning a svn rebase ? Rebasing a publicly published branch is generally not a good idea (even when using pure git), because it invalidates all local changes that other people might have. So either you create a new branch in which these rebased changes go, or instead you merge the changes, make your changes (which may consist of just copying over the results from your rebase and then adding the file) and commit. Note that when merging using git-svn, you must add the following to your ~/.gitconfig or in .git/config of the clone: [svn] pushmergeinfo = true Additionally, merge with --no-ff. If you do those two things (and don't rebase afterwards), git-svn will properly update the svn merge information in the remote repository. Jonas I did a rebase only for my local branch. So it is easy to merge the svn branch. I don't want to use svn-git since I'm neither confident everything is setup right nor will end up the way I want it to. The local git is more or less only a playground for me. But since I already did the work there it should be easy to do a merge in the RTTI branch. What I wanted to know is, in which way can I integrate the current svn trunk in the RTTI branch, preventing headache for anyone using it. Steve ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] RTTI
On 24/08/15 21:45, Steve Hildebrandt wrote: What I wanted to know is, in which way can I integrate the current svn trunk in the RTTI branch, preventing headache for anyone using it. 1) check out the rtti svn branch 2) svn merge ^/trunk - you'll get conflicts for ncgrtti.pas, postpone conflict resolution 3) copy your rebased ncgrtti.pas over the one with conflicts 4) svn resolved compiler/ncgrtti.pas 5) svn commit Jonas ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] ppudump question
Thanks! It was a great suggestion! It is probably related to empty sets - but there is also something else - i have *.pp with [] passed as parameter but *.ppu does not mention set with empty ElType :( Thanks again! Gennady On 8/24/2015 3:05 AM, Pierre Free Pascal wrote: Maybe you are using empty sets in your source code? An empty set: [] has no elements and thus the compiler cannot know what the type of the elements are. In the hope that this will help, Pierre Muller -Message d'origine- De : fpc-devel-boun...@lists.freepascal.org [mailto:fpc-devel- boun...@lists.freepascal.org] De la part de Gennady Agranov Envoyé : dimanche 23 août 2015 00:46 À : fpc-devel@lists.freepascal.org Objet : [fpc-devel] ppudump question Hi, 1. I have code that heavily uses enums/sets When I use ppudump to print *.ppu files I see some sets reported with null ElType and I do not understand what causes them :( And I do not believe that they are referenced at all... Any ideas why set is reported with no ElType? Thanks, Gennady Example: json version: { Type: set, Id: 236, Size: 1, Base: 0, Max: 0, ElType: null }, text version: ** Definition Id 236 ** Set definition Type symbol : (7357) Nil DefOptions : DefStates : Element type : (7361) Nil Size : 1 Set Base : 0 Set Max : 0 xml version: set id236/id size1/size base0/base max0/max eltype/eltype /set { Type: set, Id: 92, Size: 1, Base: 0, Max: 0, ElType: null } ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel